summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2020-09-09 14:51:10 -0700
committerCommit Bot <commit-bot@chromium.org>2020-09-11 16:57:37 +0000
commit4bb06cc1b73c738acf056d7fc0a96c4690e8ef8a (patch)
tree4206b2f4324c1b4dc4720ef186046a807ad72f84 /scripts
parent1166a2fa507be97896e41ed048693e9232e26f62 (diff)
downloadvboot-4bb06cc1b73c738acf056d7fc0a96c4690e8ef8a.tar.gz
COIL: Change denylist to blocklist
The signer uses BLOCKLIST instead of DENYLIST. This patches make the language match. BUG=b:163883397 BRANCH=None TEST=egrep -i -I -r "deny.*list" TEST=make runtests Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Change-Id: I47c913eb2ca89cd3eea4ca3ff5f1accb223ba418 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2401968 Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/image_signing/ensure_no_nonrelease_files.sh6
-rwxr-xr-xscripts/image_signing/ensure_sane_lsb-release.sh2
-rw-r--r--scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config2
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/image_signing/ensure_no_nonrelease_files.sh b/scripts/image_signing/ensure_no_nonrelease_files.sh
index 3b2dd7ed..48c75af6 100755
--- a/scripts/image_signing/ensure_no_nonrelease_files.sh
+++ b/scripts/image_signing/ensure_no_nonrelease_files.sh
@@ -41,10 +41,10 @@ main() {
local rootfs=$(make_temp_dir)
mount_loop_image_partition_ro "${loopdev}" 3 "${rootfs}"
# Pick the right set of test-expectation data to use.
- local boardvar=$(get_boardvar_from_lsb_release "${rootfs}")
- eval "release_file_denylist=(\"\${RELEASE_FILE_DENYLIST_${boardvar}[@]}\")"
+ local brdvar=$(get_boardvar_from_lsb_release "${rootfs}")
+ eval "release_file_blocklist=(\"\${RELEASE_FILE_BLOCKLIST_${brdvar}[@]}\")"
- for file in ${release_file_denylist}; do
+ for file in ${release_file_blocklist}; do
if [ -e "${rootfs}/${file}" ]; then
error "${file} exists in this image!"
ls -al "${rootfs}/${file}"
diff --git a/scripts/image_signing/ensure_sane_lsb-release.sh b/scripts/image_signing/ensure_sane_lsb-release.sh
index 388a756d..08469639 100755
--- a/scripts/image_signing/ensure_sane_lsb-release.sh
+++ b/scripts/image_signing/ensure_sane_lsb-release.sh
@@ -34,7 +34,7 @@ lsbequals() {
# Usage: check_keyval_in_list lsbfile lsbkey [list of values]
# Extracts the lsb-release value for the specified key, and confirms it
-# matches one of the allowlisted values specified in value_array.
+# matches one of the allowed values specified in value_array.
# Implementation note:
# You can't really pass bash arrays to functions. Best you can do is either
# serialize to string/pass/deserialize (e.g. using whitspace/IFS hacks), or,
diff --git a/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config b/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config
index f98f3305..3e7556b6 100644
--- a/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config
+++ b/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config
@@ -6,7 +6,7 @@
# Files/directories that should never be present in a clean,
# standard release build.
-RELEASE_FILE_DENYLIST=(
+RELEASE_FILE_BLOCKLIST=(
# Flag-file indicating "developer mode", crosh offers "shell" if present:
/root/.dev_mode