commit 59df3bbe04155fd6f2afc5f87978acae969f3b9a
author Cheng Yueh <cyueh@chromium.org> Fri Mar 05 12:48:22 2021
committer Commit Bot <commit-bot@chromium.org> Tue Mar 09 15:06:43 2021
tree 9ebc91d42461f28cee2d7db1dec1def5fa159285
parent 224ea9f5f21f47d15441751a6844825dbc8af300

factory_debug: Print more log to debug get_fixed_dst_drive

Update baseboard-${BOARD}/scripts/disk_layout.json if your devices path
is not in the DEFAULT_ROOTDEV.

Also fix missing strorage information header.

BUG=b:181843815
TEST=Boot from shim and press D and then press 9 to see logs

Change-Id: I90454fa0dc9e5d2fb5d0a5fbfac84e2ecf2ba587
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory_installer/+/2739774
Reviewed-by: Cheng-Han Yang <chenghan@chromium.org>
Commit-Queue: Cheng Yueh <cyueh@chromium.org>
Tested-by: Cheng Yueh <cyueh@chromium.org>

factory_debug.sh

diff --git a/factory_debug.sh b/factory_debug.sh
index 6e44997..4a690a1 100644
--- a/factory_debug.sh
+++ b/factory_debug.sh
@@ -6,9 +6,12 @@
 
 # This script contains debug functions called by factory_install.sh
 
+. "/usr/share/misc/storage-info-common.sh"
+. "/usr/sbin/write_gpt.sh"
+
 DEBUG_FUNCTIONS=(call_dev_debug_vboot call_mosys_eventlog sys_fw_log call_dmesg
                  call_get_storage_info checksums call_lspci cat_write_gpt
-                 dd_storage)
+                 dd_storage debug_get_fixed_dst_drive)
 
 # Checks if the given debug action is valid and supported.
 is_valid_debug_action() {
@@ -28,6 +31,7 @@
   echo "##   6) lspci"
   echo "##   7) /usr/sbin/write_gpt.sh"
   echo "##   8) dd storage device"
+  echo "##   9) get_fixed_dst_drive logs"
   echo "##   s) Save all debug information to USB"
   echo "##   q) Quit debug console"
 }
@@ -109,6 +113,45 @@
   done
 }
 
+debug_get_fixed_dst_drive() {
+  load_base_vars
+  # Modify get_fixed_dst_drive function from
+  # platform2/chromeos-common-script/share/chromeos-common.sh
+  # and add more logs to help debug "Cannot find fixed drive." issue.
+  local dev rootdev
+  echo "DEFAULT_ROOTDEV: ${DEFAULT_ROOTDEV}"
+  if [ -n "${DEFAULT_ROOTDEV}" ]; then
+    # No " here, the variable may contain wildcards.
+    for rootdev in ${DEFAULT_ROOTDEV}; do
+      echo "rootdev: ${rootdev}"
+      dev="/dev/$(basename "${rootdev}")"
+      echo "original dev: ${dev}"
+      if [ -b "${dev}" ]; then
+        echo "original dev exists"
+        case "${dev}" in
+          *nvme*)
+            dev="/dev/$(get_largest_nvme_namespace "${dev}")"
+            ;;
+        esac
+        break
+      else
+        echo "original dev does not exist"
+        dev=""
+      fi
+    done
+  else
+    echo "DEFAULT_ROOTDEV does not exist"
+    dev=""
+  fi
+  echo "final dev: ${dev}"
+  echo "If your devices path is not in the DEFAULT_ROOTDEV,"
+  echo "then update baseboard-BOARD/scripts/disk_layout.json"
+  echo "nvme:"
+  echo "$(find /sys/devices -name nvme*)"
+  echo "mmc:"
+  echo "$(find /sys/devices -name mmc*)"
+}
+
 debug_save_logs() {
   echo "-- USB info --"
   lsblk -p -S