diff options
| author | Anoop C S <anoopcs@redhat.com> | 2019-06-12 15:41:27 +0530 |
|---|---|---|
| committer | hari gowtham <hari.gowtham005@gmail.com> | 2019-07-16 05:02:47 +0000 |
| commit | 08f8a3b8ea85cae64083f0425c7cee9500d27a16 (patch) | |
| tree | 6a012ae5315fb4e36d6ab5e84f8ce313e15c729e | |
| parent | 99977a7b694f6ee137e7b749f04e0cc744dd17e3 (diff) | |
extras/hooks: Install and package newly added post add-brick hook script
https://review.gluster.org/c/glusterfs/+/22913 added a new SELinux hook
script as a post add-brick operation to label new brick paths. But the
change failed to install and package new script. Therefore making
necessary changes to Makefile and spec file to get it installed and
packaged.
Backport of:
> Change-Id: I67b8f4982c2783c34a4bc749fb4387c19a038225
> fixes: bz#1717953
> Signed-off-by: Anoop C S <anoopcs@redhat.com>
Change-Id: I67b8f4982c2783c34a4bc749fb4387c19a038225
fixes: bz#1718227
Signed-off-by: Anoop C S <anoopcs@redhat.com>
(cherry picked from commit 647a1b83fa39a635b01fcba38a330485fcd6afdb)
| -rw-r--r-- | extras/hook-scripts/add-brick/post/Makefile.am | 4 | ||||
| -rw-r--r-- | glusterfs.spec.in | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extras/hook-scripts/add-brick/post/Makefile.am b/extras/hook-scripts/add-brick/post/Makefile.am index bfc0c1cf080..9b236df096d 100644 --- a/extras/hook-scripts/add-brick/post/Makefile.am +++ b/extras/hook-scripts/add-brick/post/Makefile.am @@ -1,6 +1,6 @@ -EXTRA_DIST = disabled-quota-root-xattr-heal.sh S13create-subdir-mounts.sh +EXTRA_DIST = disabled-quota-root-xattr-heal.sh S10selinux-label-brick.sh S13create-subdir-mounts.sh hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/post/ if WITH_SERVER -hook_SCRIPTS = disabled-quota-root-xattr-heal.sh S13create-subdir-mounts.sh +hook_SCRIPTS = disabled-quota-root-xattr-heal.sh S10selinux-label-brick.sh S13create-subdir-mounts.sh endif diff --git a/glusterfs.spec.in b/glusterfs.spec.in index c655f16442e..2d53bbe7525 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1330,6 +1330,7 @@ exit 0 %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/S10selinux-label-brick.sh %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/S13create-subdir-mounts.sh %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh |