commit dedcb9a6a4f5e756b1996e99a0a4e5e03b06d84c
author Adriana Kobylak <anoo@us.ibm.com> Fri Jun 02 09:05:54 2023 -0500
committer Adriana Kobylak <anoo@linux.ibm.com> Mon Jun 05 20:18:55 2023 +0000
tree f62628f2780f5a384a38f5c6d1d58af889beb606
parent dcfadad5acc06010ef3b58004ca36833e0e316f1

mmc: Don't remove hostfw if it's not being updated

The image-hostfw is optional, therefore don't delete it unless it's
going to be updated, to prevent ending up with a system that doesn't
have a bios image to boot with.

Tested: Verify the hostfw image doesn't get deleted unless the tarball
contains an image-hostfw file.

Change-Id: Ifd48988d1a499eb8a3539701f12ca43efcb56f6d
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

obmc-flash-bmc

diff --git a/obmc-flash-bmc b/obmc-flash-bmc
index d604e71..442bb7a 100644
--- a/obmc-flash-bmc
+++ b/obmc-flash-bmc
@@ -590,14 +590,21 @@
     # Run this after sgdisk for labels to take effect.
     partprobe
 
-    # Update hostfw
+    # Update hostfw. The remove function doesn't touch the hostfw image, so
+    # need to unmount and delete it prior to updating it.
     if [ -f "${imgpath}"/"${version}"/image-hostfw ]; then
         # Remove patches
-        patchdir="/usr/local/share/hostfw/alternate"
+        hostfw_alt="hostfw/alternate"
+        patchdir="/usr/local/share/${hostfw_alt}"
         if [ -d "${patchdir}" ]; then
             rm -rf "${patchdir:?}"/*
         fi
+        if grep -q "${hostfw_alt}" /proc/mounts; then
+            hostfw_alt=$(grep "${hostfw_alt}" /proc/mounts | cut -d " " -f 2)
+            umount "${hostfw_alt}"
+        fi
         hostfwdir=$(grep "hostfw " /proc/mounts | cut -d " " -f 2)
+        rm -f "${hostfwdir}/hostfw-${flashid}"
         cp "${imgpath}"/"${version}"/image-hostfw "${hostfwdir}"/hostfw-"${label}"
         mkdir -p "${hostfwdir}"/alternate
         mount "${hostfwdir}"/hostfw-"${label}" "${hostfwdir}"/alternate -o ro
@@ -617,17 +624,6 @@
     fi
     dd if=/dev/zero of=/dev/disk/by-partlabel/boot-"${flashid}" count=2048
     dd if=/dev/zero of=/dev/disk/by-partlabel/rofs-"${flashid}" count=2048
-
-    hostfw_alt="hostfw/alternate"
-    if grep -q "${hostfw_alt}" /proc/mounts; then
-        hostfw_alt=$(grep "${hostfw_alt}" /proc/mounts | cut -d " " -f 2)
-        umount "${hostfw_alt}"
-    fi
-    hostfw_base="hostfw "
-    if grep -q "${hostfw_base}" /proc/mounts; then
-        hostfw_base=$(grep "${hostfw_base}" /proc/mounts | cut -d " " -f 2)
-        rm -f "${hostfw_base}/hostfw-${flashid}"
-    fi
 }
 
 # Set the requested version as primary for the BMC to boot from upon reboot.