Blame SOURCES/bz1818997-3-nfsserver-nfsnotify-fix-selinux-label-issue.patch

8d2604
From dbd45cb5fcce0a3378f6ecd0c14b578e6f843e3d Mon Sep 17 00:00:00 2001
8d2604
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
8d2604
Date: Fri, 24 Jul 2020 16:03:20 +0200
8d2604
Subject: [PATCH 1/2] nfsserver: fix SELinux issue due to newer ls versions
8d2604
 giving additional output.
8d2604
8d2604
This patch has been tested on RHEL6, 7 and 8.
8d2604
---
8d2604
 heartbeat/nfsserver | 2 +-
8d2604
 1 file changed, 1 insertion(+), 1 deletion(-)
8d2604
8d2604
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
8d2604
index 0dbc173f3..80d20676b 100755
8d2604
--- a/heartbeat/nfsserver
8d2604
+++ b/heartbeat/nfsserver
8d2604
@@ -192,7 +192,7 @@ fi
8d2604
 which restorecon > /dev/null 2>&1 && selinuxenabled
8d2604
 SELINUX_ENABLED=$?
8d2604
 if [ $SELINUX_ENABLED -eq 0 ]; then
8d2604
-	export SELINUX_LABEL="$(ls -ldZ $STATD_PATH | cut -f4 -d' ')"
8d2604
+	export SELINUX_LABEL="$(ls -dZ $STATD_PATH | grep -o '\S\+:\S\+:\S\+')"
8d2604
 fi
8d2604
 
8d2604
 ##
8d2604
8d2604
From 81118dbb25fe2cfc7d5fc803178cd7c3b445915e Mon Sep 17 00:00:00 2001
8d2604
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
8d2604
Date: Mon, 27 Jul 2020 10:33:44 +0200
8d2604
Subject: [PATCH 2/2] nfsnotify: fix SELinux issue due to newer ls versions
8d2604
 giving additional output.
8d2604
8d2604
---
8d2604
 heartbeat/nfsnotify.in | 2 +-
8d2604
 1 file changed, 1 insertion(+), 1 deletion(-)
8d2604
8d2604
diff --git a/heartbeat/nfsnotify.in b/heartbeat/nfsnotify.in
8d2604
index 7f710bca7..851f6ad6b 100644
8d2604
--- a/heartbeat/nfsnotify.in
8d2604
+++ b/heartbeat/nfsnotify.in
8d2604
@@ -305,7 +305,7 @@ esac
8d2604
 which restorecon > /dev/null 2>&1 && selinuxenabled
8d2604
 SELINUX_ENABLED=$?
8d2604
 if [ $SELINUX_ENABLED -eq 0 ]; then
8d2604
-	export SELINUX_LABEL="$(ls -ldZ $STATD_PATH | cut -f4 -d' ')"
8d2604
+	export SELINUX_LABEL="$(ls -dZ $STATD_PATH | grep -o '\S\+:\S\+:\S\+')"
8d2604
 fi
8d2604
 
8d2604
 case $__OCF_ACTION in