diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2020-08-12 15:46:30 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-19 02:09:04 +0000 |
| commit | 3932b1c8729e9bfac918da50224d06adae73fde0 (patch) | |
| tree | c9e59a0c279fb352a36d3f3528149bc54ad51d1e | |
| parent | 053592bd3d5fcb79b8fa3a6f6193ffedfc041dba (diff) | |
| download | vboot-3932b1c8729e9bfac918da50224d06adae73fde0.tar.gz | |
inclusive: change usage of blacklist/whitelist
Google is working to change its source code to use more inclusive
language. To that end, replace the term "blacklist" & "whitelist"
with inclusive alternatives.
chrome-internal:3214766, chrome-internal:3214767, chrome-internal:3214831
will be checked in separately. They refer to a pinned vboot_reference.
So, this patch won't affect the signer until the pin is moved.
BUG=b:163883397
BRANCH=None
TEST=grep -ir "white*list"
TEST=grep -ir "black*list"
TEST=make runtests
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: Iff98b55713b3c7381ba092ff14b50141b8422cf2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2353421
Reviewed-by: Julius Werner <jwerner@chromium.org>
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 |