diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-31 12:09:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-30 12:45:46 +0200 |
| commit | 52c31adcb06d700f7ba1798bb255d059b0144587 (patch) | |
| tree | 937cf15a236ff8ee9db3fe1ab4bbfb5d868d7e53 | |
| parent | d33909c5ed6567663ec4bc3593c57fa9c8634f40 (diff) | |
| download | barebox-52c31adcb06d700f7ba1798bb255d059b0144587.tar.gz barebox-52c31adcb06d700f7ba1798bb255d059b0144587.tar.xz | |
defaultenv-2: remove global.tftp.path
This variable is set in /env/init/general and then used
in /env/boot/* which is a bit confusing. Also it does not
necessarily have to be a tftp path (could be nfs aswell).
Use a local variable in the scripts using it instead to make
the meaning a bit more clear.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | defaultenv-2/base/bin/init | 2 | ||||
| -rw-r--r-- | defaultenv-2/base/boot/initrd | 5 | ||||
| -rw-r--r-- | defaultenv-2/base/boot/net | 6 | ||||
| -rw-r--r-- | defaultenv-2/base/init/general | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init index e293c62b01..9d7eb2eea7 100644 --- a/defaultenv-2/base/bin/init +++ b/defaultenv-2/base/bin/init @@ -4,8 +4,6 @@ export PATH=/env/bin global hostname=generic global user=none -global tftp.server -global tftp.path=/mnt/tftp-dhcp global autoboot_timeout=3 global boot.default=net global allow_color=true diff --git a/defaultenv-2/base/boot/initrd b/defaultenv-2/base/boot/initrd index 1a1e629bcf..79a353a10a 100644 --- a/defaultenv-2/base/boot/initrd +++ b/defaultenv-2/base/boot/initrd @@ -5,8 +5,9 @@ if [ "$1" = menu ]; then exit fi -global.bootm.image="${global.tftp.path}/${global.user}-linux-${global.hostname}" -global.bootm.initrd="${global.tftp.path}/initramfs" +path="/mnt/tftp" +global.bootm.image="${path}/${global.user}-linux-${global.hostname}" +global.bootm.initrd="${path}/initramfs" bootargs-root-initrd #global.bootm.oftree=<path to oftree> diff --git a/defaultenv-2/base/boot/net b/defaultenv-2/base/boot/net index 2684c20a6c..922bef12bb 100644 --- a/defaultenv-2/base/boot/net +++ b/defaultenv-2/base/boot/net @@ -5,8 +5,10 @@ if [ "$1" = menu ]; then exit fi -global.bootm.image="${global.tftp.path}/${global.user}-linux-${global.hostname}" -#global.bootm.oftree="${global.tftp.path}/${global.user}-oftree-${global.hostname}" +path="/mnt/tftp" + +global.bootm.image="${path}/${global.user}-linux-${global.hostname}" +#global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}" nfsroot="/home/${global.user}/nfsroot/${global.hostname}" bootargs-ip bootargs-root-nfs -n "$nfsroot" diff --git a/defaultenv-2/base/init/general b/defaultenv-2/base/init/general index 2fea03d61b..98a92d1b80 100644 --- a/defaultenv-2/base/init/general +++ b/defaultenv-2/base/init/general @@ -13,6 +13,3 @@ global.autoboot_timeout=3 # default boot entry (one of /env/boot/*) global.boot.default=net - -# default tftp path -global.tftp.path=/mnt/tftp |