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>
This commit is contained in:
parent
d33909c5ed
commit
52c31adcb0
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue