diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init index e293c62b0..9d7eb2eea 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 1a1e629bc..79a353a10 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= diff --git a/defaultenv-2/base/boot/net b/defaultenv-2/base/boot/net index 2684c20a6..922bef12b 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 2fea03d61..98a92d1b8 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