summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/image_signing/ensure_no_nonrelease_files.sh4
-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, 4 insertions, 4 deletions
diff --git a/scripts/image_signing/ensure_no_nonrelease_files.sh b/scripts/image_signing/ensure_no_nonrelease_files.sh
index 4426d840..3b2dd7ed 100755
--- a/scripts/image_signing/ensure_no_nonrelease_files.sh
+++ b/scripts/image_signing/ensure_no_nonrelease_files.sh
@@ -42,9 +42,9 @@ main() {
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_blacklist=(\"\${RELEASE_FILE_BLACKLIST_${boardvar}[@]}\")"
+ eval "release_file_denylist=(\"\${RELEASE_FILE_DENYLIST_${boardvar}[@]}\")"
- for file in ${release_file_blacklist}; do
+ for file in ${release_file_denylist}; 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 7476a8e4..388a756d 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 whitelisted values specified in value_array.
+# matches one of the allowlisted 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 1ca02f1a..f98f3305 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_BLACKLIST=(
+RELEASE_FILE_DENYLIST=(
# Flag-file indicating "developer mode", crosh offers "shell" if present:
/root/.dev_mode