diff options
author | Wojciech Banaś <fizista@gmail.com> | 2022-02-14 15:23:20 +0300 |
---|---|---|
committer | Wojciech Banaś <fizista@gmail.com> | 2022-02-14 15:23:20 +0300 |
commit | 4098236412d5f846f43576a35ac8694ed4783ce8 (patch) | |
tree | 6baf56462306457140989e2a3be9773e3e3579ef /include/tests_boot_services | |
parent | 4f382331b3d7d141c49a971050d3a9b61a94c511 (diff) |
#1270 added finding configuration files in the "etc" directory, even if they are symlinks
Diffstat (limited to 'include/tests_boot_services')
-rw-r--r-- | include/tests_boot_services | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/tests_boot_services b/include/tests_boot_services index 4a5fb3df..5901cd70 100644 --- a/include/tests_boot_services +++ b/include/tests_boot_services @@ -347,7 +347,7 @@ FOUND=0 if [ -d "${ROOTDIR}etc/grub.d" ]; then - CONF_FILES=$(${FINDBINARY} "${ROOTDIR}etc/grub.d" -type f -name "[0-9][0-9]*" -print0 | ${TRBINARY} '\0' ' ' | ${TRBINARY} -d '[:cntrl:]') + CONF_FILES=$(${FINDBINARY} -L "${ROOTDIR}etc/grub.d" -type f -name "[0-9][0-9]*" -print0 | ${TRBINARY} '\0' ' ' | ${TRBINARY} -d '[:cntrl:]') CONF_FILES="${GRUBCONFFILE} ${ROOTDIR}boot/grub/custom.cfg ${CONF_FILES}" else CONF_FILES="${GRUBCONFFILE} ${ROOTDIR}boot/grub/custom.cfg" @@ -785,7 +785,7 @@ if [ -d ${DIR} ]; then LogText "Result: directory ${DIR} found" LogText "Test: checking for available files in directory" - FIND=$(${FINDBINARY} ${DIR} -type f -print | ${SORTBINARY}) + FIND=$(${FINDBINARY} -L ${DIR} -type f -print | ${SORTBINARY}) if [ -n "${FIND}" ]; then LogText "Result: found files in directory, checking permissions now" for FILE in ${FIND}; do @@ -809,7 +809,7 @@ for NO in 0 1 2 3 4 5 6; do LogText "Test: Checking ${ROOTDIR}etc/rc${NO}.d scripts for writable bit" if [ -d ${ROOTDIR}etc/rc${NO}.d ]; then - FIND=$(${FINDBINARY} ${ROOTDIR}etc/rc${NO}.d -type f -print | ${SORTBINARY}) + FIND=$(${FINDBINARY} -L ${ROOTDIR}etc/rc${NO}.d -type f -print | ${SORTBINARY}) for I in ${FIND}; do if IsWorldWritable ${I}; then FOUND=1 @@ -1017,7 +1017,7 @@ LogText "Result: directory ${DIR} found" LogText "Test: checking for available files in directory" # OpenBSD uses symlinks to create another instance of daemons - FIND=$(${FINDBINARY} ${CHECKDIR} \( -type f -o -type l \) -print | ${SORTBINARY}) + FIND=$(${FINDBINARY} -L ${CHECKDIR} -type f -print | ${SORTBINARY}) if [ -n "${FIND}" ]; then LogText "Result: found files in directory, checking permissions now" for FILE in ${FIND}; do |