[rc.local] separate configuration migration and grub installation log…

…ic (#5528) To address issue #5525 Explicitly control the grub installation requirement when it is needed. We have scenario where configuration migration happened but grub installation is not required. Signed-off-by: Ying Xie <[email protected]>
sonic-net · Oct 4, 2020 · ec01530 · ec01530
1 parent dbea3bb
commit ec01530
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
@@ -199,6 +199,7 @@ logger "SONiC version ${SONIC_VERSION} starting up..."
 
 # If the machine.conf is absent, it indicates that the unit booted
 # into SONiC from another NOS. Extract the machine.conf from ONIE.
+grub_installation_needed=""
 if [ ! -e /host/machine.conf ]; then
     onie_dev=$(blkid | grep ONIE-BOOT | head -n 1 | awk '{print $1}' |  sed -e 's/:.*$//')
     mkdir -p /mnt/onie-boot
@@ -213,6 +214,7 @@ if [ ! -e /host/machine.conf ]; then
             eval val='$'onie_$var
             echo "onie_${var}=${val}" >> /host/machine.conf
         done
+        grub_installation_needed="TRUE"
     fi
 
     umount /mnt/onie-boot
@@ -277,7 +279,7 @@ if [ -f $FIRST_BOOT_FILE ]; then
 
     # If the unit booted into SONiC from another NOS's grub,
     # we now install a grub for SONiC.
-    if [ -n "$onie_platform" ] && [ -n "$migration" ]; then
+    if [ -n "$onie_platform" ] && [ -n  "$grub_installation_needed" ]; then
 
         grub_bin=$(ls /host/image-$SONIC_VERSION/platform/x86_64-grub/grub-pc-bin*.deb 2> /dev/null)
         if [ -z "$grub_bin" ]; then