mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 07:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(test_image_content): Clean out some stray tab chars

Browse Source
This commit is contained in:
Michael Marineau 2013-11-27 14:54:13 -08:00
parent fd7976e7fd
commit 4e8bef60d7
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
build_library/test_image_content.sh
View File

@ -5,32 +5,32 @@
# Files that are known to conflict with /usr but are OK because they # Files that are known to conflict with /usr but are OK because they
# are already fixed by toggling the symlink-usr USE flag. # are already fixed by toggling the symlink-usr USE flag.
USR_CONFLICT_WHITELIST=( USR_CONFLICT_WHITELIST=(
/bin/awk /bin/awk
/bin/basename /bin/basename
/bin/chroot /bin/chroot
/bin/cut /bin/cut
/bin/dir /bin/dir
/bin/dirname /bin/dirname
/bin/du /bin/du
/bin/env /bin/env
/bin/expr /bin/expr
/bin/gawk /bin/gawk
/bin/head /bin/head
/bin/mkfifo /bin/mkfifo
/bin/mktemp /bin/mktemp
/bin/passwd /bin/passwd
/bin/readlink /bin/readlink
/bin/seq /bin/seq
/bin/sleep /bin/sleep
/bin/sort /bin/sort
/bin/tail /bin/tail
/bin/touch /bin/touch
/bin/tr /bin/tr
/bin/tty /bin/tty
/bin/uname /bin/uname
/bin/vdir /bin/vdir
/bin/wc /bin/wc
/bin/yes /bin/yes
) )
test_image_content() { test_image_content() {
@ -100,8 +100,8 @@ test_image_content() {
local whitelist local whitelist
for whitelist in "${USR_CONFLICT_WHITELIST[@]}"; do for whitelist in "${USR_CONFLICT_WHITELIST[@]}"; do
if [[ "${trimmed_path}" == "${whitelist}" ]]; then if [[ "${trimmed_path}" == "${whitelist}" ]]; then
continue 2 continue 2
fi fi
done done
if [[ -e "${root_file}" || -h "${root_file}" ]]; then if [[ -e "${root_file}" || -h "${root_file}" ]]; then
# TODO(marineam): make fatal before switching to symlinks # TODO(marineam): make fatal before switching to symlinks