diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
| commit | c8af035b4176af0e8da2cdd2d10109b56e06444e (patch) | |
| tree | 5e1e6feff42470e7c167c89ee07b7e8b1c37f81b /defaultenv-2 | |
| parent | 3cdd18632e72cbb8b0402df3e4821dfd7d24643b (diff) | |
| parent | 9e809ef4317cf96a477342a09b8c205a49e44554 (diff) | |
| download | barebox-c8af035b4176af0e8da2cdd2d10109b56e06444e.tar.gz barebox-c8af035b4176af0e8da2cdd2d10109b56e06444e.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'defaultenv-2')
| -rw-r--r-- | defaultenv-2/base/bin/init | 12 | ||||
| -rw-r--r-- | defaultenv-2/base/boot/net | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init index 6a658d137c..ca02ba6427 100644 --- a/defaultenv-2/base/bin/init +++ b/defaultenv-2/base/bin/init @@ -16,12 +16,6 @@ global editcmd=sedit [ -e /env/config-board ] && /env/config-board /env/config -if [ -e /env/menu ]; then - echo -e -n "\nHit m for menu or any other key to stop autoboot: " -else - echo -e -n "\nHit any key to stop autoboot: " -fi - # allow to stop the boot before execute the /env/init/* # but without waiting timeout -s -a -v key 0 @@ -34,6 +28,12 @@ for i in /env/init/*; do . $i done +if [ -e /env/menu ]; then + echo -e -n "\nHit m for menu or any other key to stop autoboot: " +else + echo -e -n "\nHit any key to stop autoboot: " +fi + timeout -a $global.autoboot_timeout -v key autoboot="$?" diff --git a/defaultenv-2/base/boot/net b/defaultenv-2/base/boot/net index 90c25aa147..05bb728fa1 100644 --- a/defaultenv-2/base/boot/net +++ b/defaultenv-2/base/boot/net @@ -8,7 +8,12 @@ fi path="/mnt/tftp" global.bootm.image="${path}/${global.user}-linux-${global.hostname}" -#global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}" + +oftree="${path}/${global.user}-oftree-${global.hostname}" +if [ -f "${oftree}" ]; then + global.bootm.oftree="$oftree" +fi + nfsroot="/home/${global.user}/nfsroot/${global.hostname}" bootargs-ip global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" |