summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHung-Te Lin <hungte@chromium.org>2011-07-01 17:38:55 +0800
committerHung-Te Lin <hungte@chromium.org>2011-07-01 03:12:03 -0700
commita7a879e0fbada0dd148781dfe325f4c7dc09c31b (patch)
tree23707ff082b864894634860d19b85af9cf5fd51f
parentc3b877d8cb2e413816d34ed685c6a35780e07bc8 (diff)
downloadvboot-a7a879e0fbada0dd148781dfe325f4c7dc09c31b.tar.gz
make_dev_ssd: support new %U parameter
The %U is better since arm and x86 both supports it now. BUG=chromium-os:15683 TEST=./make_dev_ssd.sh # need latest kernel patch Change-Id: I94a6471788d3496cfa7ef263493e89877bb2b593 Reviewed-on: http://gerrit.chromium.org/gerrit/3551 Reviewed-by: Che-Liang Chiou <clchiou@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
-rwxr-xr-xscripts/image_signing/make_dev_ssd.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh
index 193c393c..5dc88857 100755
--- a/scripts/image_signing/make_dev_ssd.sh
+++ b/scripts/image_signing/make_dev_ssd.sh
@@ -60,11 +60,7 @@ EXEC_LOG="$(make_temp_file)"
# Removes rootfs verification from kernel boot parameter
remove_rootfs_verification() {
- # TODO(hungte) replace this with %U when x86 and arm both supports it.
- local new_root="/dev/sd%D%P"
- if [ "$(crossystem arch 2>/dev/null)" = "arm" ]; then
- new_root='/dev/${devname}${rootpart}'
- fi
+ local new_root="PARTUUID=%U/PARTNROFF=1"
echo "$*" | sed '
s| root=/dev/dm-0 | root='"$new_root"' |
s| dm_verity[^=]*=[-0-9]*||g