Merge branch 'for-next/defenv-2'
This commit is contained in:
commit
3a997060d5
|
@ -51,9 +51,17 @@ if [ "$ip" = static ]; then
|
|||
${interface}.netmask=$netmask
|
||||
${interface}.serverip=$serverip
|
||||
${interface}.gateway=$gateway
|
||||
ret=0
|
||||
elif [ "$ip" = dhcp ]; then
|
||||
dhcp
|
||||
exit $?
|
||||
ret=$?
|
||||
if [ $ret = 0 -a -n "$serverip" ]; then
|
||||
${interface}.serverip=$serverip
|
||||
fi
|
||||
fi
|
||||
|
||||
echo -o /tmp/network/$interface up
|
||||
if [ $ret = 0 ]; then
|
||||
echo -o /tmp/network/$interface up
|
||||
fi
|
||||
|
||||
exit $ret
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -5,10 +5,10 @@ if [ "$1" = menu ]; then
|
|||
exit
|
||||
fi
|
||||
|
||||
# automount server returned from dhcp server
|
||||
# automount tftp server based on $eth0.serverip
|
||||
|
||||
mkdir -p /mnt/tftp-dhcp
|
||||
automount /mnt/tftp-dhcp 'ifup eth0 && mount $eth0.serverip tftp /mnt/tftp-dhcp'
|
||||
mkdir -p /mnt/tftp
|
||||
automount /mnt/tftp 'ifup eth0 && mount $eth0.serverip tftp /mnt/tftp'
|
||||
|
||||
# automount nfs server example
|
||||
|
||||
|
@ -16,11 +16,6 @@ automount /mnt/tftp-dhcp 'ifup eth0 && mount $eth0.serverip tftp /mnt/tftp-dhcp'
|
|||
#mkdir -p /mnt/${nfshost}
|
||||
#automount /mnt/$nfshost "ifup eth0 && mount ${nfshost}:/tftpboot nfs /mnt/${nfshost}"
|
||||
|
||||
# static tftp server example
|
||||
|
||||
#mkdir -p /mnt/tftp
|
||||
#automount -d /mnt/tftp 'ifup eth0 && mount $serverip tftp /mnt/tftp'
|
||||
|
||||
# FAT on usb disk example
|
||||
|
||||
#mkdir -p /mnt/fat
|
||||
|
|
|
@ -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-dhcp
|
||||
|
|
Loading…
Reference in New Issue