From ed92adaddfc5407d5bdd2a9a5fd51df6591e8ded Mon Sep 17 00:00:00 2001 From: Paul Taysom Date: Wed, 15 May 2013 09:23:39 -0700 Subject: [PATCH] Added support for PARTUUID= The Linux kernel expects partitions that are identified by uuid, to have the the uuid prefixed by "PARTUUID=" and an optional suffix of "PARTRNOFF=%d". The change adds additional pattern matching for these strings. This will also let get rid of custom uuid processing in dm-verity, dm-bootcache and dm-verity-chromeos. BUG=chromium:224066 TEST=security_test_image with old and new command line BRANCH=none Change-Id: I71b89dd1df8d7ccd5768c2784078bb869d546bf3 Reviewed-on: https://gerrit.chromium.org/gerrit/51303 Reviewed-by: Mike Frysinger Commit-Queue: Paul Taysom Tested-by: Paul Taysom --- scripts/image_signing/ensure_secure_kernelparams.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/image_signing/ensure_secure_kernelparams.sh b/scripts/image_signing/ensure_secure_kernelparams.sh index 5f06e2e794..7d9c050dc5 100755 --- a/scripts/image_signing/ensure_secure_kernelparams.sh +++ b/scripts/image_signing/ensure_secure_kernelparams.sh @@ -43,7 +43,7 @@ dmparams_mangle() { # with MAGIC_HASH. The parameter is positional. if [[ $dmparams == *bootcache* ]]; then dmparams=$(echo $dmparams | - sed -r 's/(bootcache %U\+1 [0-9]+) [0-9a-fA-F]+/\1 MAGIC_HASH/') + sed -r 's:(bootcache (PARTUUID=)?%U(/PARTNROFF=|\+)1 [0-9]+) [0-9a-fA-F]+:\1 MAGIC_HASH:') fi echo $dmparams }