bfb-install: BFB format conversion for runtime upgrade

This commit has some fixes for 91385a6.

RM #4449636

Author: lsun100

man/bfb-install.8

@@ -45,6 +45,8 @@ host side.
 -b, --bfb
 
 This is the BFB image to use, which is pushed as the boot stream.
+When doing runtime upgrade, bundle BFB with initramfs will be converted
+to flat bfb with FW images only before pushed as the boot stream.
 
 .TP
 -c, --config
@@ -143,4 +145,4 @@ When using remote mode nc or ncpipe, there's a short window of time when there
 is a netcat server running on the local or remote host on the specified TCP port
 (default 9527). This could be a potential security risk. So these two methods
 should only be used on a secure network and the security implications are
-understood.
+understood.

scripts/bfb-install

@@ -800,6 +800,17 @@ if [ $verbose -eq 1 ]; then
   echo "  RSHIM Device Node: $rshim_node"
 fi
 
+# Root access check.
+check_root_cmd="[ \$(id -u) -eq 0 ]"
+echo "Checking if local host has root access..."
+if ! eval "$check_root_cmd"; then
+  echo "  Warning: No host root access. Trying sudo"
+  sudo_prefix="sudo"
+fi
+
+# rshim is ready to use.
+run_cmd_local_ready=1
+
 # Setup checks
 
 # Check BF chip version and adjust register offsets.
@@ -876,6 +887,10 @@ elif [ ${runtime} -eq 1 ]; then
   is_bundle=$(mlx-mkbfb -d "${bfb}" | grep "In-memory filesystem")
   if [ -n "${is_bundle}" -a -n "$pcie_bd" ]; then
     echo "Convert $(basename "${bfb}") to flat format for runtime upgrade"
+    if ! which flint &> /dev/null; then
+      echo "Error: flint not found."
+      exit 1
+    fi
     psid=$(flint -d "$pcie_bd".0 q | grep PSID | awk '{print $2}')
     if [ -z "${psid}" ]; then
       echo "Error: failed to get PSID."
@@ -916,15 +931,6 @@ if [ -n "${cfg}" ] && [ ! -e "${cfg}" ]; then
   exit 1
 fi
 
-check_root_cmd="[ \$(id -u) -eq 0 ]"
-echo "Checking if local host has root access..."
-if ! eval "$check_root_cmd"; then
-  echo "  Warning: No host root access. Trying sudo"
-  sudo_prefix="sudo"
-fi
-
-run_cmd_local_ready=1
-
 rshim_check_cmd="[ -e ${rshim_node}/boot ]"
 
 if [ $mode == "local" ]; then