diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:25 +0200 |
| commit | 33c56e21eb3bf841c79d9c8a40dedc8b16b774f2 (patch) | |
| tree | fc0e871d5fc9020e0c4bb01ef0a5cf4ece6060a1 /defaultenv-2 | |
| parent | d32008b2797a7c1bb13ec0cb3273de2dfcc97d02 (diff) | |
| parent | ce8f489122e8390360e87c84888aacfc87743a83 (diff) | |
| download | barebox-33c56e21eb3bf841c79d9c8a40dedc8b16b774f2.tar.gz barebox-33c56e21eb3bf841c79d9c8a40dedc8b16b774f2.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
commands/Makefile
Diffstat (limited to 'defaultenv-2')
| -rw-r--r-- | defaultenv-2/base/bin/init | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init index 81b3434913..d7bd0cb140 100644 --- a/defaultenv-2/base/bin/init +++ b/defaultenv-2/base/bin/init @@ -2,16 +2,23 @@ export PATH=/env/bin -global hostname=generic -global user=none -global autoboot_timeout=3 -global boot.default=net -global allow_color=true +global hostname +global user +global autoboot_timeout +global boot.default +global allow_color global linux.bootargs.base #linux.bootargs.dyn.* will be cleared at the beginning of boot global linux.bootargs.dyn.ip global linux.bootargs.dyn.root -global editcmd=sedit +global editcmd + +[ -z "${global.hostname}" ] && global.hostname=generic +[ -z "${global.user}" ] && global.user=none +[ -z "${global.autoboot_timeout}" ] && global.autoboot_timeout=3 +[ -z "${global.boot.default}" ] && global.boot.default=net +[ -z "${global.allow_color}" ] && global.allow_color=true +[ -z "${global.editcmd}" ] && global.editcmd=sedit [ -e /env/config-board ] && /env/config-board /env/config |