diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index ad67f0ff42..2beec7500c 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -82,10 +82,6 @@ update_mgmt_interface_macaddr() {
 
     log_migration "eth0 mac in EEPROM after update:"
     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() {
diff --git a/files/initramfs-tools/union-mount.j2 b/files/initramfs-tools/union-mount.j2
index 8c8bb92644..81d35dd834 100644
--- a/files/initramfs-tools/union-mount.j2
+++ b/files/initramfs-tools/union-mount.j2
@@ -109,7 +109,10 @@ mount --bind ${rootmnt}/host/$image_dir/boot ${rootmnt}/boot
 ## Mount loop device or tmpfs for /var/log
 onie_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"  ] ||
    [ X"$aboot_platform" = X"x86_64-arista_7050_qx32s" ] ||
    [ X"$aboot_platform" = X"x86_64-arista_7060_cx32s" ]