defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globalvar
linux.bootargs.dyn.* will be cleared at the beginning of boot This is need for boot sequence to do not have the previous boot param. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
parent
4732c27030
commit
86df3fcd30
|
@ -5,7 +5,7 @@
|
|||
. /env/network/eth0
|
||||
|
||||
if [ $ip = dhcp ]; then
|
||||
global.linux.bootargs.ip="ip=dhcp"
|
||||
global.linux.bootargs.dyn.ip="ip=dhcp"
|
||||
else
|
||||
global.linux.bootargs.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:"
|
||||
global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:"
|
||||
fi
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
|
||||
ifup eth0
|
||||
|
||||
global.linux.bootargs.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:"
|
||||
global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:"
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
# Do dhcp in Linux
|
||||
|
||||
global.linux.bootargs.ip="ip=dhcp"
|
||||
global.linux.bootargs.dyn.ip="ip=dhcp"
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
# disable ip setup in Linux
|
||||
|
||||
global.linux.bootargs.ip="ip=none"
|
||||
global.linux.bootargs.dyn.ip="ip=none"
|
||||
|
|
|
@ -23,4 +23,4 @@ if [ -z "${fstype}" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
global.linux.bootargs.root="root=/dev/$part rootfstype=$fstype rootwait"
|
||||
global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=$fstype rootwait"
|
||||
|
|
|
@ -9,4 +9,4 @@ while getopt "m:r:" opt; do
|
|||
fi
|
||||
done
|
||||
|
||||
global.linux.bootargs.root="root=/dev/$part rootfstype=ext$type rootwait"
|
||||
global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=ext$type rootwait"
|
||||
|
|
|
@ -13,4 +13,4 @@ while getopt "i:h" opt; do
|
|||
fi
|
||||
done
|
||||
|
||||
global.linux.bootargs.root="root=/dev/ram0 rdinit=${rdinit}"
|
||||
global.linux.bootargs.dyn.root="root=/dev/ram0 rdinit=${rdinit}"
|
||||
|
|
|
@ -18,4 +18,4 @@ if [ -z "$mtd" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
global.linux.bootargs.root="root=$mtd rootfstype=jffs2"
|
||||
global.linux.bootargs.dyn.root="root=$mtd rootfstype=jffs2"
|
||||
|
|
|
@ -17,4 +17,4 @@ if [ -n ${serverip} ]; then
|
|||
nfsroot="$serverip:$nfsroot"
|
||||
fi
|
||||
|
||||
global.linux.bootargs.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"
|
||||
global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"
|
||||
|
|
|
@ -21,4 +21,4 @@ if [ -z "$mtd" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
global.linux.bootargs.root="root=ubi0:$ubiroot ubi.mtd=$mtd rootfstype=ubifs"
|
||||
global.linux.bootargs.dyn.root="root=ubi0:$ubiroot ubi.mtd=$mtd rootfstype=ubifs"
|
||||
|
|
|
@ -8,8 +8,9 @@ global autoboot_timeout=3
|
|||
global boot.default=net
|
||||
global allow_color=true
|
||||
global linux.bootargs.base
|
||||
global linux.bootargs.ip
|
||||
global linux.bootargs.root
|
||||
#linux.bootargs.dyn.* will be clearer at the beginning of boot
|
||||
global linux.bootargs.dyn.ip
|
||||
global linux.bootargs.dyn.root
|
||||
global editcmd=sedit
|
||||
|
||||
/env/init/general
|
||||
|
|
|
@ -11,7 +11,7 @@ global.bootm.initrd="${path}/initramfs"
|
|||
bootargs-root-initrd
|
||||
#global.bootm.oftree=<path to oftree>
|
||||
|
||||
global.linux.bootargs.root="root=/dev/ram0"
|
||||
global.linux.bootargs.dyn.root="root=/dev/ram0"
|
||||
|
||||
#bootargs-root-nfs -n "<path on server>" -s <serverip>
|
||||
#bootargs-root-ubi -r <volume> -m <mtdname>
|
||||
|
|
Loading…
Reference in New Issue