diff options
| author | Amey Deshpande <ameyd@google.com> | 2015-04-24 13:56:17 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-04-29 19:43:14 +0000 |
| commit | 7dd3bd0fcf565901aacc512cd29cefe19291c2e7 (patch) | |
| tree | 4fb4a73d67dc10a570842ea8479d3d108f26ef7a /scripts/image_signing/ensure_secure_kernelparams.sh | |
| parent | 4ce1cc01c08ad58abca12577c5d18e9071a26383 (diff) | |
| download | vboot-7dd3bd0fcf565901aacc512cd29cefe19291c2e7.tar.gz | |
image_signing: use per-board release file blackliststabilize-7039.B
This patch changes ensure_no_nonrelease_files.sh to use per-board
release file blacklist instead of the default one. It also uses this
opportunity to make ensure_no_nonrelease_files.sh consistently
formatted.
BRANCH=none
TEST=Ran ./security_test_image on a lakitu image and --vboot_hash
pointing to this commit, and verified ensure_no_nonrelease_files.sh passes.
BUG=brillo:823
Change-Id: I2cff56192a5ff0b917faba7549e7adafb4757a47
Reviewed-on: https://chromium-review.googlesource.com/267335
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Amey Deshpande <ameyd@google.com>
Tested-by: Amey Deshpande <ameyd@google.com>
Diffstat (limited to 'scripts/image_signing/ensure_secure_kernelparams.sh')
| -rwxr-xr-x | scripts/image_signing/ensure_secure_kernelparams.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/image_signing/ensure_secure_kernelparams.sh b/scripts/image_signing/ensure_secure_kernelparams.sh index a471a6fc..044b441e 100755 --- a/scripts/image_signing/ensure_secure_kernelparams.sh +++ b/scripts/image_signing/ensure_secure_kernelparams.sh @@ -98,10 +98,8 @@ main() { local rootfs=$(make_temp_dir) mount_image_partition_ro "$image" 3 "$rootfs" - # Pick the right set of test-expectation data to use. The cuts - # turn e.g. x86-foo as a well as x86-foo-pvtkeys into x86_foo. - local board=$(grep CHROMEOS_RELEASE_BOARD= "$rootfs/etc/lsb-release" | \ - cut -d = -f 2 | cut -d - -f 1,2 --output-delimiter=_) + # Pick the right set of test-expectation data to use. + local board=$(get_board_from_lsb_release "${rootfs}") eval "required_kparams=(\"\${required_kparams_$board[@]}\")" eval "required_kparams_regex=(\"\${required_kparams_regex_$board[@]}\")" eval "optional_kparams=(\"\${optional_kparams_$board[@]}\")" |