diff options
| author | Paul Taysom <taysom@chromium.org> | 2013-05-15 09:23:39 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-05-16 12:16:30 -0700 |
| commit | ed92adaddfc5407d5bdd2a9a5fd51df6591e8ded (patch) | |
| tree | 056ff5b47708487b1e816ac4da429e45e386b7ca | |
| parent | 416bdc680c53c153187e85eb1ed949e40ca1231a (diff) | |
| download | vboot-ed92adaddfc5407d5bdd2a9a5fd51df6591e8ded.tar.gz | |
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 <vapier@chromium.org>
Commit-Queue: Paul Taysom <taysom@chromium.org>
Tested-by: Paul Taysom <taysom@chromium.org>
| -rwxr-xr-x | scripts/image_signing/ensure_secure_kernelparams.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/image_signing/ensure_secure_kernelparams.sh b/scripts/image_signing/ensure_secure_kernelparams.sh index 5f06e2e7..7d9c050d 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 } |