diff options
| author | Mark Ruys <mark.ruys@peercode.nl> | 2016-08-29 20:30:48 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2016-08-29 20:30:48 +0300 |
| commit | e6a829b6edea9703b382aec4d12958d622daa794 (patch) | |
| tree | 28310b9883f3aaede4e45c1ff009c365d5ab9222 /include/tests_filesystems | |
| parent | 2b6d48304acb80576f06e29f0ec49b90226aad24 (diff) | |
GlusterFS mounts are nodev and nosuid by default, and are invalid mount options. So ignore GlusterFS mount points. (#268)
Diffstat (limited to 'include/tests_filesystems')
| -rw-r--r-- | include/tests_filesystems | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/tests_filesystems b/include/tests_filesystems index 21986d2a..cf848c8b 100644 --- a/include/tests_filesystems +++ b/include/tests_filesystems @@ -499,8 +499,14 @@ for I in ${FILESYSTEMS_TO_CHECK}; do FILESYSTEM=$(echo ${I} | cut -d: -f1) EXPECTED_FLAGS=$(echo ${I} | cut -d: -f2 | sed 's/,/ /g') - IN_FSTAB=$(${AWKBINARY} -v fs=${FILESYSTEM} '{ if ($2==fs) { print "FOUND" } }' /etc/fstab) - if [ ! "${IN_FSTAB}" = "" ]; then + FS_FSTAB=$(${AWKBINARY} -v fs=${FILESYSTEM} '{ if ($2==fs) { print $3 } }' /etc/fstab) + if [ "${FS_FSTAB}" = "glusterfs" ]; then + EXPECTED_FLAGS=$(echo ${EXPECTED_FLAGS} | sed 's/\<\(nodev\|nosuid\)\> *//g') + if [ "${EXPECTED_FLAGS}" = "" ]; then + FS_FSTAB="" + fi + fi + if [ ! "${FS_FSTAB}" = "" ]; then FOUND_FLAGS=$(${AWKBINARY} -v fs=${FILESYSTEM} '{ if ($2==fs) { print $4 } }' /etc/fstab | sed 's/,/ /g' | tr '\n' ' ') LogText "File system: ${FILESYSTEM}" LogText "Expected flags: ${EXPECTED_FLAGS}" |