From a64d9dbb586b1418c172acb588a3f7b14af8c590 Mon Sep 17 00:00:00 2001
From: Paul Taysom <taysom@chromium.org>
Date: Fri, 21 Sep 2012 13:30:43 -0700
Subject: [PATCH] Changed to use /dev/dm* instead of /dev/dm-0

Changed update_kernel.sh to use /dev/dm* to mean verity
is being used instead of /dev/dm-0.

BUG=chromium-os:25441
TEST=Used update_kernel.sh to update kernel on stumpy

Change-Id: I187fe0b43c65a6bfa7a689d31ae2cfd86fda558f
Reviewed-on: https://gerrit.chromium.org/gerrit/33797
Tested-by: Paul Taysom <taysom@chromium.org>
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Commit-Ready: Paul Taysom <taysom@chromium.org>
---
 update_kernel.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/update_kernel.sh b/update_kernel.sh
index c1da2bf6c9..75b495f237 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -43,9 +43,8 @@ learn_device() {
 learn_partition_and_ro() {
   [ -n "${FLAGS_partition}" ] && return
   ! remote_sh rootdev
-  if [ "${REMOTE_OUT}" == "/dev/dm-0" ]; then
-    remote_sh ls /sys/block/dm-0/slaves
-    REMOTE_OUT="/dev/${REMOTE_OUT}"
+  if [ "${REMOTE_OUT%%-*}" == "/dev/dm" ]; then
+    remote_sh rootdev -s
     REMOTE_VERITY=${FLAGS_TRUE}
     info "System is using verity: not updating firmware"
   else