From cbe1b007a3f9aaad26a7736c66ade357cd3c88d6 Mon Sep 17 00:00:00 2001 From: Patrick Van der Veken Date: Wed, 3 Oct 2018 13:37:12 +0200 Subject: [PATCH] Regex + comment fix --- sources/lib/platform/aix/check_aix_fs_mounts.sh | 2 +- sources/lib/platform/hp-ux/check_hpux_fs_mounts.sh | 2 +- sources/lib/platform/linux/check_linux_fs_mounts.sh | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sources/lib/platform/aix/check_aix_fs_mounts.sh b/sources/lib/platform/aix/check_aix_fs_mounts.sh index 6ba2a41..6d64ca7 100644 --- a/sources/lib/platform/aix/check_aix_fs_mounts.sh +++ b/sources/lib/platform/aix/check_aix_fs_mounts.sh @@ -61,7 +61,7 @@ mount >>${HC_STDOUT_LOG} 2>>${HC_STDERR_LOG} lsfs -ac >>${HC_STDOUT_LOG} 2>>${HC_STDERR_LOG} (( $? == 0)) || return $? -# check for each auto-mount configured file system (except /) +# check for each configured file system (except /) lsfs -ac 2>/dev/null |\ grep -v -E -e '^#' -e '^\/:' |\ grep -E -e '.*:.*:.*:.*:.*:.*:.*:yes:.*' |\ diff --git a/sources/lib/platform/hp-ux/check_hpux_fs_mounts.sh b/sources/lib/platform/hp-ux/check_hpux_fs_mounts.sh index 31c8536..fab6bc5 100644 --- a/sources/lib/platform/hp-ux/check_hpux_fs_mounts.sh +++ b/sources/lib/platform/hp-ux/check_hpux_fs_mounts.sh @@ -61,7 +61,7 @@ done mount >>${HC_STDOUT_LOG} 2>>${HC_STDERR_LOG} (( $? == 0)) || return $? -# check for each auto-mount configured file system (except / and dump/swap) +# check for each configured file system (except / and dump/swap) grep -v -E -e '^#' -e '^$' \ -e '[[:space:]]*\/[[:space:]]+' -e '\.\.\.' /etc/fstab 2>/dev/null |\ awk '{print $2}' |\ diff --git a/sources/lib/platform/linux/check_linux_fs_mounts.sh b/sources/lib/platform/linux/check_linux_fs_mounts.sh index 61a058c..953b421 100644 --- a/sources/lib/platform/linux/check_linux_fs_mounts.sh +++ b/sources/lib/platform/linux/check_linux_fs_mounts.sh @@ -25,6 +25,7 @@ # @(#) 2013-05-17: initial version [Patrick Van der Veken] # @(#) 2018-05-21: STDERR fixes [Patrick Van der Veken] # @(#) 2018-08-25: small fix [Patrick Van der Veken] +# @(#) 2018-10-02: regex fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -33,7 +34,7 @@ function check_linux_fs_mounts { # ------------------------- CONFIGURATION starts here ------------------------- -typeset _VERSION="2018-08-25" # YYYY-MM-DD +typeset _VERSION="2018-10-02" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # ------------------------- CONFIGURATION ends here --------------------------- @@ -62,11 +63,11 @@ done mount >>${HC_STDOUT_LOG} 2>>${HC_STDERR_LOG} (( $? == 0 )) || return $? -# check for each auto-mount configured file system (except /) +# check for each configured file system (except /) grep -v -E -e '^#' -e '^$' \ - -e '[ \t]*.*[ \t]+(proc|swap|sysfs|devpts|tmpfs).*' \ + -e '[[:space:]]*.*[[:space:]]+(proc|swap|sysfs|devpts|tmpfs).*' \ -e '(floppy|cdrom)' \ - -e '[ \t]*\/[ \t]+' /etc/fstab 2>/dev/null |\ + -e '[[:space:]]*\/[[:space:]]+' /etc/fstab 2>/dev/null |\ awk '{print $2}' |\ while read _FS do