diff options
| author | Anoop C S <anoopcs@redhat.com> | 2019-06-12 15:41:27 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2019-06-19 13:07:53 +0000 |
| commit | 647a1b83fa39a635b01fcba38a330485fcd6afdb (patch) | |
| tree | 0d044bb0359c90bfeb41da2fdfc2d8720e5b8955 | |
| parent | b99f6eba2e4d53ba8220034d9b8a4530681ec77e (diff) | |
extras/hooks: Install and package newly added post add-brick hook script
https://review.gluster.org/c/glusterfs/+/22834 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.
Change-Id: I67b8f4982c2783c34a4bc749fb4387c19a038225
fixes: bz#1717953
Signed-off-by: Anoop C S <anoopcs@redhat.com>
| -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 e815137b8d7..89cd2a4aeb8 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1323,6 +1323,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 |