diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:37 +0100 |
| commit | 13408877f4c0d4b2784d3388dd4481369205e46a (patch) | |
| tree | 81bd24a8bac468785989c5b8b82a489befcddc5a /defaultenv-2 | |
| parent | 908bc8ce45f428658dab5826eb6fa2e5d9151aa1 (diff) | |
| parent | 14743045fb31bd1d2d4b7eb2ccd2e956b44b01bd (diff) | |
| download | barebox-13408877f4c0d4b2784d3388dd4481369205e46a.tar.gz barebox-13408877f4c0d4b2784d3388dd4481369205e46a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'defaultenv-2')
| -rw-r--r-- | defaultenv-2/base/bin/init | 1 | ||||
| -rw-r--r-- | defaultenv-2/base/config | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init index b606b634a2..e4a7feef79 100644 --- a/defaultenv-2/base/bin/init +++ b/defaultenv-2/base/bin/init @@ -13,6 +13,7 @@ global linux.bootargs.dyn.ip global linux.bootargs.dyn.root global editcmd=sedit +/env/config-board /env/config if [ -e /env/menu ]; then diff --git a/defaultenv-2/base/config b/defaultenv-2/base/config index 189e5a68f2..dec0595333 100644 --- a/defaultenv-2/base/config +++ b/defaultenv-2/base/config @@ -6,16 +6,16 @@ #global.hostname= # set to false if you do not want to have colors -global.allow_color=true +#global.allow_color=true # user (used for network filenames) -global.user=none +#global.user=none # timeout in seconds before the default boot entry is started -global.autoboot_timeout=3 +#global.autoboot_timeout=3 # default boot entry (one of /env/boot/*) -global.boot.default=net +#global.boot.default=net # base bootargs #global.linux.bootargs.base="console=ttyS0,115200" |