ca3909
From 27d69d8927a946562aef08a6edfee38b9998f96d Mon Sep 17 00:00:00 2001
ca3909
From: Anoop C S <anoopcs@redhat.com>
ca3909
Date: Wed, 12 Jun 2019 15:41:27 +0530
ca3909
Subject: [PATCH 325/335] extras/hooks: Install and package newly added post
ca3909
 add-brick hook script
ca3909
ca3909
Previously a new SELinux hook script was added as a post add-brick
ca3909
operation to label new brick paths. But the change failed to install
ca3909
and package new script. Therefore making necessary changes to Makefile
ca3909
and spec file to get it installed and packaged.
ca3909
ca3909
Backport of https://review.gluster.org/c/glusterfs/+/22856
ca3909
ca3909
Change-Id: I67b8f4982c2783c34a4bc749fb4387c19a038225
ca3909
BUG: 1686800
ca3909
Signed-off-by: Anoop C S <anoopcs@redhat.com>
ca3909
Reviewed-on: https://code.engineering.redhat.com/gerrit/185856
ca3909
Tested-by: RHGS Build Bot <nigelb@redhat.com>
ca3909
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
ca3909
---
ca3909
 extras/hook-scripts/add-brick/post/Makefile.am | 4 ++--
ca3909
 glusterfs.spec.in                              | 1 +
ca3909
 2 files changed, 3 insertions(+), 2 deletions(-)
ca3909
ca3909
diff --git a/extras/hook-scripts/add-brick/post/Makefile.am b/extras/hook-scripts/add-brick/post/Makefile.am
ca3909
index bfc0c1c..9b236df 100644
ca3909
--- a/extras/hook-scripts/add-brick/post/Makefile.am
ca3909
+++ b/extras/hook-scripts/add-brick/post/Makefile.am
ca3909
@@ -1,6 +1,6 @@
ca3909
-EXTRA_DIST = disabled-quota-root-xattr-heal.sh S13create-subdir-mounts.sh
ca3909
+EXTRA_DIST = disabled-quota-root-xattr-heal.sh S10selinux-label-brick.sh S13create-subdir-mounts.sh
ca3909
 
ca3909
 hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/post/
ca3909
 if WITH_SERVER
ca3909
-hook_SCRIPTS = disabled-quota-root-xattr-heal.sh S13create-subdir-mounts.sh
ca3909
+hook_SCRIPTS = disabled-quota-root-xattr-heal.sh S10selinux-label-brick.sh S13create-subdir-mounts.sh
ca3909
 endif
ca3909
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
ca3909
index eeadb65..91180db 100644
ca3909
--- a/glusterfs.spec.in
ca3909
+++ b/glusterfs.spec.in
ca3909
@@ -1447,6 +1447,7 @@ exit 0
ca3909
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick
ca3909
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post
ca3909
             %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh
ca3909
+            %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/S10selinux-label-brick.sh
ca3909
             %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/S13create-subdir-mounts.sh
ca3909
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
ca3909
             %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
ca3909
-- 
ca3909
1.8.3.1
ca3909