mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-23 22:51:03 +02:00
fix(test_image_content): Clean out some stray tab chars
This commit is contained in:
parent
fd7976e7fd
commit
4e8bef60d7
@ -5,32 +5,32 @@
|
||||
# Files that are known to conflict with /usr but are OK because they
|
||||
# are already fixed by toggling the symlink-usr USE flag.
|
||||
USR_CONFLICT_WHITELIST=(
|
||||
/bin/awk
|
||||
/bin/basename
|
||||
/bin/chroot
|
||||
/bin/cut
|
||||
/bin/dir
|
||||
/bin/dirname
|
||||
/bin/du
|
||||
/bin/env
|
||||
/bin/expr
|
||||
/bin/gawk
|
||||
/bin/head
|
||||
/bin/mkfifo
|
||||
/bin/mktemp
|
||||
/bin/passwd
|
||||
/bin/readlink
|
||||
/bin/seq
|
||||
/bin/sleep
|
||||
/bin/sort
|
||||
/bin/tail
|
||||
/bin/touch
|
||||
/bin/tr
|
||||
/bin/tty
|
||||
/bin/uname
|
||||
/bin/vdir
|
||||
/bin/wc
|
||||
/bin/yes
|
||||
/bin/awk
|
||||
/bin/basename
|
||||
/bin/chroot
|
||||
/bin/cut
|
||||
/bin/dir
|
||||
/bin/dirname
|
||||
/bin/du
|
||||
/bin/env
|
||||
/bin/expr
|
||||
/bin/gawk
|
||||
/bin/head
|
||||
/bin/mkfifo
|
||||
/bin/mktemp
|
||||
/bin/passwd
|
||||
/bin/readlink
|
||||
/bin/seq
|
||||
/bin/sleep
|
||||
/bin/sort
|
||||
/bin/tail
|
||||
/bin/touch
|
||||
/bin/tr
|
||||
/bin/tty
|
||||
/bin/uname
|
||||
/bin/vdir
|
||||
/bin/wc
|
||||
/bin/yes
|
||||
)
|
||||
|
||||
test_image_content() {
|
||||
@ -100,8 +100,8 @@ test_image_content() {
|
||||
local whitelist
|
||||
for whitelist in "${USR_CONFLICT_WHITELIST[@]}"; do
|
||||
if [[ "${trimmed_path}" == "${whitelist}" ]]; then
|
||||
continue 2
|
||||
fi
|
||||
continue 2
|
||||
fi
|
||||
done
|
||||
if [[ -e "${root_file}" || -h "${root_file}" ]]; then
|
||||
# TODO(marineam): make fatal before switching to symlinks
|
||||
|
Loading…
x
Reference in New Issue
Block a user