commit e28bcb61c37351e1539d162831dbc6b3f2eb3b82
author bowgotsai <bowgotsai@chromium.org> Thu Feb 26 22:17:01 2015 +0800
committer Shun-Hsing Ou <shunhsingou@chromium.org> Sun Oct 18 04:55:33 2015 +0000
tree 300a5759778f1e867e20816e09fb1fe20b434c9e
parent 5e9bfde1edab291ae87cd782ece620dafac942af

CHERRY-PICK: clobber-state: try to get rootfs partition/disk from environement variables

clobber-state invokes 'rootdev' command to get rootfs partition and root disk.
Sometimes we'll invoke 'clobber-state' directly under a tmpfs for factory
wiping. The 'rootdev' cannot report correct output under such
a situation. This CL tries to get rootfs partition/disk from environment
variables first and fallbacks to 'rootdev' command if it's unavailable.

BUG=chromium:427793
TEST=Manual on a Paine device:
     1. exports ROOT_DEV="/dev/sda3"
     2. exports ROOT_DISK="/dev/sda"
     3. clobber-state "factory fast"

Change-Id: Id83dc246c54e9f911e971f2dff60787001a84d14
Reviewed-on: https://chromium-review.googlesource.com/254043
Tested-by: Bowgo Tsai <bowgotsai@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Bowgo Tsai <bowgotsai@chromium.org>
(cherry picked from commit 3f7db8b36d3814cf31a25726b354819ca990f387)
Reviewed-on: https://chromium-review.googlesource.com/306925
Reviewed-by: Shun-Hsing Ou <shunhsingou@chromium.org>
Tested-by: Shun-Hsing Ou <shunhsingou@chromium.org>

init/clobber-state

diff --git a/init/clobber-state b/init/clobber-state
index cd0a952..78ffa3d 100755
--- a/init/clobber-state
+++ b/init/clobber-state
@@ -148,7 +148,7 @@
 # bit set to 1 (only tries).
 ensure_bootable_kernel() {
   local kernel_num="$1"
-  local dst="$(rootdev -d -s)"
+  local dst="$2"
   local active_flag="$(cgpt show -S -i "${kernel_num}" "${dst}")"
   local priority="$(cgpt show -P -i "${kernel_num}" "${dst}")"
 
@@ -163,7 +163,19 @@
 
 # Root devs are sda3, sda5.
 # Kernel devs to go along with these are sda2, sda4 respectively.
-ROOT_DEV=$(rootdev -s)
+
+# As we move factory wiping from release image to factory test image,
+# clobber-state will be invoked directly under a tmpfs. 'rootdev' cannot
+# report correct output under such a situation. Therefore, the output of
+# 'rootdev' is preserved then assigned to environment variables
+# ${ROOT_DEV}/${ROOT_DISK} for clobber-state. For other cases, the
+# environment variables will be empty and it fallbacks to use 'rootdev'.
+if [ -z "${ROOT_DEV}" ]; then
+  ROOT_DEV=$(rootdev -s)
+fi
+if [ -z "${ROOT_DISK}" ]; then
+  ROOT_DISK=$(rootdev -d -s)
+fi
 STATE_DEV=${ROOT_DEV%[0-9]*}1
 OTHER_ROOT_DEV=$(echo $ROOT_DEV | tr '35' '53')
 KERNEL_DEV=$(echo $ROOT_DEV | tr '35' '24')
@@ -255,14 +267,14 @@
   # the stateful partition.
   dd bs=4M count=1 if=/dev/zero of=${STATE_DEV}
   if [ -z "${KEEPIMG}" ]; then
-    ensure_bootable_kernel "${KERNEL_PART_NUM}"
+    ensure_bootable_kernel "${KERNEL_PART_NUM}" "${ROOT_DISK}"
     dd bs=4M count=1 if=/dev/zero of=${OTHER_ROOT_DEV}
     dd bs=4M count=1 if=/dev/zero of=${OTHER_KERNEL_DEV}
   fi
 else
 
   if [ -z "${KEEPIMG}" ]; then
-    ensure_bootable_kernel "${KERNEL_PART_NUM}"
+    ensure_bootable_kernel "${KERNEL_PART_NUM}" "${ROOT_DISK}"
     wipedev ${OTHER_ROOT_DEV}
     wipedev ${OTHER_KERNEL_DEV}
   fi