diff options
| -rw-r--r-- | glusterfs.spec.in | 12 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-hooks.c | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index ca9b2faa4c9..72ad7311806 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -961,6 +961,15 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd %endif +%config %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh +%config %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh +%config %{_sharedstatedir}/glusterd/hooks/1/set/post/S30samba-set.sh +%config %{_sharedstatedir}/glusterd/hooks/1/set/post/S31ganesha-set.sh +%config %{_sharedstatedir}/glusterd/hooks/1/start/post/S29CTDBsetup.sh +%config %{_sharedstatedir}/glusterd/hooks/1/start/post/S30samba-start.sh +%config %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh +%config %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh +%config %{_sharedstatedir}/glusterd/hooks/1/reset/post/S31ganesha-reset.sh # init files %_init_glusterd %if ( 0%{_for_fedora_koji_builds} ) @@ -1013,6 +1022,9 @@ fi %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %changelog +* Thu May 22 2014 Poornima G <pgurusid@redhat.com> +- Rename old hookscripts in an RPM-standard way. + * Tue May 20 2014 Niels de Vos <ndevos@redhat.com> - Almost drop calling ./autogen.sh diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.c b/xlators/mgmt/glusterd/src/glusterd-hooks.c index a845f540afa..2d402b0dd56 100644 --- a/xlators/mgmt/glusterd/src/glusterd-hooks.c +++ b/xlators/mgmt/glusterd/src/glusterd-hooks.c @@ -66,7 +66,8 @@ char glusterd_hook_dirnames[GD_OP_MAX][256] = static inline gf_boolean_t glusterd_is_hook_enabled (char *script) { - return (script[0] == 'S'); + return (script[0] == 'S' && (fnmatch ("*.rpmsave", script, 0) != 0) + && (fnmatch ("*.rpmnew", script, 0) != 0)); } int |