diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-21 10:33:33 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-21 10:33:33 +0100 |
| commit | b82f0d4c09afcbee12c980337113c60c2f1ccbe4 (patch) | |
| tree | 08bc7777a3886d9e5e9d8378b8e0bdf9ad58cbda | |
| parent | 9f19ee267173a1c2ff89288fb9a670bd3fb1bd6f (diff) | |
| parent | 19c0219d4e8182b539af74d4576cc51935515725 (diff) | |
| download | barebox-b82f0d4c09afcbee12c980337113c60c2f1ccbe4.tar.gz barebox-b82f0d4c09afcbee12c980337113c60c2f1ccbe4.tar.xz | |
Merge branch 'defenv' into next
| -rw-r--r-- | defaultenv/bin/init | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/defaultenv/bin/init b/defaultenv/bin/init index 96a5716628..b66f7d988c 100644 --- a/defaultenv/bin/init +++ b/defaultenv/bin/init @@ -4,15 +4,15 @@ PATH=/env/bin export PATH . /env/config -if [ -e /dev/nor0 ]; then +if [ -e /dev/nor0 -a -n "$nor_parts" ]; then addpart /dev/nor0 $nor_parts fi -if [ -e /dev/disk0 ]; then +if [ -e /dev/disk0 -a -n "$disk_parts" ]; then addpart /dev/disk0 $disk_parts fi -if [ -e /dev/nand0 ]; then +if [ -e /dev/nand0 -a -n "$nand_parts" ]; then addpart /dev/nand0 $nand_parts # Uh, oh, hush first expands wildcards and then starts executing @@ -28,9 +28,6 @@ echo echo -n "Hit any key to stop autoboot: " timeout -a $autoboot_timeout if [ $? != 0 ]; then - echo - update -h - echo exit fi |