From d2ba553715ad7421c906c73234ca623212e37bde Mon Sep 17 00:00:00 2001 From: "Evgeny Alekseev (IBS Group)" Date: Fri, 23 Sep 2022 22:08:22 +0300 Subject: IBS:Fix SILABMC-300(initrd MACs=>u-boot-env) --- .../initrdscripts/obmc-phosphor-initfs/obmc-init.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh b/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh index ac685e7494..f81caedeca 100644 --- a/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh +++ b/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh @@ -422,7 +422,9 @@ netmask=$(get_fw_env_var netmask) ethif=$(get_fw_env_var ethif) #Specialy swap mac addresses because of u-boot swap mac0=$(get_fw_env_var eth1addr) -mac1=$(get_fw_var eth0addr) +mac1=$(get_fw_env_var eth0addr) +echo mac0: $mac0 +echo mac1: $mac1 ip link set dev eth0 down ip link set dev eth1 down ip link set dev eth0 address $mac0 @@ -430,6 +432,14 @@ ip link set dev eth1 address $mac1 ip link set dev eth0 up ip link set dev eth1 up +env_valid=$(get_fw_env_var env_valid) +if [ -z "$env_valid" ] +then + fw_setenv eth1addr $mac0 + fw_setenv eth0addr $mac1 + fw_setenv ethaddr $mac1 + fw_setenv env_valid 1 +fi if [ -n "$nfs_bootargs" ] then @@ -459,10 +469,13 @@ HERE debug_takeover "$msg" done + + for f in $fslist do mount --move $f root/$f done + # switch_root /root $init exec chroot /root $init -- cgit v1.2.3