summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Taysom <taysom@chromium.org>2012-11-26 16:56:41 -0800
committerGerrit <chrome-bot@google.com>2012-11-27 10:02:43 -0800
commit8a42c2718fce6f34baaa52146f039a2acd1477be (patch)
treec159fee25b17817314421513417d7d3aa9c718f6
parent640b1c420748049c796b3f9d59406e38ff8f4774 (diff)
downloadvboot-8a42c2718fce6f34baaa52146f039a2acd1477be.tar.gz
remove verity regardless of dm device
Changed the pattern substitution to work with dm-[0-9] BUG=chromium-os:25441 TEST=Turned off verity on stumpy both with and without bootcache BRANCH=none Change-Id: I519ad71879f2db847f450b869c8f7a67606f1e20 Reviewed-on: https://gerrit.chromium.org/gerrit/38691 Tested-by: Paul Taysom <taysom@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Paul Taysom <taysom@chromium.org>
-rwxr-xr-xscripts/image_signing/make_dev_ssd.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh
index 8f360715..5be09cb5 100755
--- a/scripts/image_signing/make_dev_ssd.sh
+++ b/scripts/image_signing/make_dev_ssd.sh
@@ -62,7 +62,7 @@ EXEC_LOG="$(make_temp_file)"
remove_rootfs_verification() {
local new_root="PARTUUID=%U/PARTNROFF=1"
echo "$*" | sed '
- s| root=/dev/dm-0 | root='"$new_root"' |
+ s| root=/dev/dm-[0-9] | root='"$new_root"' |
s| dm_verity[^=]*=[-0-9]*||g
s| dm="[^"]*"||
s| ro | rw |'