From 75e69e1440c52709ac3cf7cb2ca64de9ffd97a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Tue, 10 Apr 2018 15:14:54 +0200 Subject: [PATCH 1/2] Use blkid in place of lsblk --- evocheck.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 1e9c876..341d900 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -745,10 +745,10 @@ if [ -e /etc/debian_version ]; then fi if [ "$IS_DUPLICATE_FS_LABEL" = 1 ]; then - # Only on systems which have lsblk - if [ -x "$(which lsblk)" ]; then + # Do it only if thereis blkid binary + if [ -x "$(which blkid)" ]; then tmpFile=$(mktemp -p /tmp) - for part in $(lsblk -n -o LABEL); do + for part in $(blkid | grep -v raid_member | grep -Eo 'LABEL=".*"' | cut -d'"' -f2); do echo "$part" >> "$tmpFile" done tmpOutput=$(sort < "$tmpFile" | uniq -d) From 217e8b1115bfa7308a988f8ba4d81dedb23e92d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Tue, 10 Apr 2018 15:16:37 +0200 Subject: [PATCH 2/2] Missing fi --- evocheck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/evocheck.sh b/evocheck.sh index 341d900..c6b93f3 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -761,6 +761,7 @@ if [ -e /etc/debian_version ]; then fi rm $tmpFile fi + fi if [ "$IS_EVOLIX_USER" = 1 ]; then getent passwd evolix >/dev/null && echo 'IS_EVOLIX_USER FAILED!'