diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2014-09-26 08:44:10 -0400 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-09-26 09:57:15 -0700 |
| commit | dce9e79a7a7ccd5b998ca562ee026e4cfd5519c2 (patch) | |
| tree | 5fc634b0f732b6fbf83435937d31f35136c41de4 /glusterfs.spec.in | |
| parent | 61353a428903047d800b572637ab1df6f2b04a42 (diff) | |
glusterfs.spec.in: add psmisc to -server subpackage
apparently some minimalist installs omit psmisc
psmisc is needed for the killall in various %pre and %post scriptlets
smarter logic for restarting glusterd in %post server
Change-Id: I041f22576f25e200ff6a4e2f194e539ba7ed1d42
BUG: 1113543
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/8871
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 77f60eca0e4..f373b457dd8 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -86,6 +86,7 @@ %define _init_enable() /bin/systemctl enable %1.service ; %define _init_disable() /bin/systemctl disable %1.service ; %define _init_restart() /bin/systemctl try-restart %1.service ; +%define _init_start() /bin/systemctl start %1.service ; %define _init_stop() /bin/systemctl stop %1.service ; %define _init_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ; # can't seem to make a generic macro that works @@ -95,6 +96,7 @@ %define _init_enable() /sbin/chkconfig --add %1 ; %define _init_disable() /sbin/chkconfig --del %1 ; %define _init_restart() /sbin/service %1 condrestart &>/dev/null ; +%define _init_start() /sbin/service %1 start &>/dev/null ; %define _init_stop() /sbin/service %1 stop &>/dev/null ; %define _init_install() install -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ; # can't seem to make a generic macro that works @@ -452,9 +454,10 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-cli = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-fuse = %{version}-%{release} -# Runtime necessity for snapshot +# psmisc for killall, lvm2 for snapshot, and nfs-utils and +# rpcbind/portmap for gnfs server +Requires: psmisc Requires: lvm2 -# nfs-utils provides rpc.statd and it is a requirement for gluster-nfs Requires: nfs-utils %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) Requires: rpcbind @@ -777,6 +780,9 @@ if [ $? -eq 0 ]; then killall --wait glusterd &> /dev/null glusterd --xlator-option *.upgrade=on -N + # glusterd _was_ running, we killed it, it exited after *.upgrade=on, + # so start it again + %_init_start glusterd else glusterd --xlator-option *.upgrade=on -N fi @@ -1030,6 +1036,9 @@ fi %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %changelog +* Thu Sep 25 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- better logic in %%post server, (#1113543, reopened) + * Wed Sep 24 2014 Balamurugan Arumugam <barumuga@redhat.com> - remove /sbin/ldconfig as interpreter (#1145992) |