commit 544b2a188f04f51642dc15af6083e0c0414b3898
author David Riley <davidriley@chromium.org> Tue Nov 14 17:03:26 2017 -0800
committer chrome-bot <chrome-bot@chromium.org> Wed Nov 15 20:21:06 2017 -0800
tree 5d86acdc36116914f215d2dba37f1a5ba7cba406
parent ee75de2127e05ec9caf67a5cc920524043e36918

devserver: Make quick provision handle /dev/sdaX partitions.

BUG=chromium:785083
TEST=build=auron_paine-paladin/R64-10083.0.0-rc2; curl "http://${ds}/stage?archive_url=gs://chromeos-image-archive/${build}&artifacts=quick_provision,stateful"; curl "http://${ds}/cros_au?full_update=False&force_update=True&build_name=${build}&host_name=${dut}&async=False&clobber_stateful=True&quick_provision=True"

Change-Id: If3336413a9b13dad427f33dc538df0a097cd0221
Reviewed-on: https://chromium-review.googlesource.com/772833
Commit-Ready: David Riley <davidriley@chromium.org>
Tested-by: David Riley <davidriley@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

quick-provision/quick-provision

diff --git a/quick-provision/quick-provision b/quick-provision/quick-provision
index 6ad6145..c32227e 100644
--- a/quick-provision/quick-provision
+++ b/quick-provision/quick-provision
@@ -185,6 +185,7 @@
   local root_disk="$(rootdev -s -d)"
   info "Current root ${current_root}, disk ${root_disk}"
 
+  # Handle both /dev/mmcblk0pX and /dev/sdaX style partitions.
   if [[ "${current_root#${root_disk}}" == "p${PARTITION_NUM_ROOT_A}" ]]; then
     NEXT_KERN_PART="${PARTITION_NUM_KERN_B}"
     NEXT_KERN="${root_disk}p${NEXT_KERN_PART}"
@@ -193,6 +194,14 @@
     NEXT_KERN_PART="${PARTITION_NUM_KERN_A}"
     NEXT_KERN="${root_disk}p${NEXT_KERN_PART}"
     NEXT_ROOT="${root_disk}p${PARTITION_NUM_ROOT_A}"
+  elif [[ "${current_root#${root_disk}}" == "${PARTITION_NUM_ROOT_A}" ]]; then
+    NEXT_KERN_PART="${PARTITION_NUM_KERN_B}"
+    NEXT_KERN="${root_disk}${NEXT_KERN_PART}"
+    NEXT_ROOT="${root_disk}${PARTITION_NUM_ROOT_B}"
+  elif [[ "${current_root#${root_disk}}" == "${PARTITION_NUM_ROOT_B}" ]]; then
+    NEXT_KERN_PART="${PARTITION_NUM_KERN_A}"
+    NEXT_KERN="${root_disk}${NEXT_KERN_PART}"
+    NEXT_ROOT="${root_disk}${PARTITION_NUM_ROOT_A}"
   else
     error "Unexpected root partition ${current_root}"
     exit 1