matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[DELL]: FTOS to SONiC fast conversion fixes (#4807)

Browse Source 
While migrating to SONiC 20181130, identified a couple of issues:
1. union-mount needs /host/machine.conf parameters for vendor specific checks : however, in case of migration, the /host/machine.conf is extracted from ONIE only in https://github.com/Azure/sonic-buildimage/blob/master/files/image_config/platform/rc.local#L127. 
2. Since grub.cfg is updated to have net.ifnames=0 biosdevname=0, 70-persistent-net.rules changes are no longer required.
This commit is contained in:
padmanarayana 2020-06-19 11:02:08 -07:00 committed by GitHub
parent 603b2955e6
commit 95e3cda5da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/image_config/platform/rc.local
View File

@ -82,10 +82,6 @@ update_mgmt_interface_macaddr() {
log_migration "eth0 mac in EEPROM after update:" log_migration "eth0 mac in EEPROM after update:"
ethtool -e eth0 offset $ethtool_offset length 6 >> /host/migration/migration.log ethtool -e eth0 offset $ethtool_offset length 6 >> /host/migration/migration.log
# Update the 70-persistent-net.rules with the new mac for eth0
log_migration "/etc/udev/rules.d/70-persistent-net.rules : replacing $old_mac with $new_mac for eth0"
sed -i "/eth0/ s/ATTR{address}==\"$old_mac\"/ATTR{address}==\"$new_mac\"/g" /etc/udev/rules.d/70-persistent-net.rules
} }
firsttime_exit() { firsttime_exit() {

5
files/initramfs-tools/union-mount.j2
View File

@ -109,7 +109,10 @@ mount --bind ${rootmnt}/host/$image_dir/boot ${rootmnt}/boot
## Mount loop device or tmpfs for /var/log ## Mount loop device or tmpfs for /var/log
onie_platform="" onie_platform=""
aboot_platform="" aboot_platform=""
. ${rootmnt}/host/machine.conf if [ -f ${rootmnt}/host/machine.conf ]; then
. ${rootmnt}/host/machine.conf
fi
if [ X"$aboot_platform" = X"x86_64-arista_7050_qx32" ] || if [ X"$aboot_platform" = X"x86_64-arista_7050_qx32" ] ||
[ X"$aboot_platform" = X"x86_64-arista_7050_qx32s" ] || [ X"$aboot_platform" = X"x86_64-arista_7050_qx32s" ] ||
[ X"$aboot_platform" = X"x86_64-arista_7060_cx32s" ] [ X"$aboot_platform" = X"x86_64-arista_7060_cx32s" ]