diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2014-09-25 11:56:08 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2014-09-26 07:31:14 -0700 |
| commit | f8b5bfd5f329ce06dcd208beaf5c50c3a35f0a53 (patch) | |
| tree | 525012c4a5fa12f6211aaee618c15f9b0301144b | |
| parent | ab0547eba39b155246f0d9f09e9a580665c6053f (diff) | |
glusterfs.spec.in: add psmisc to -server subpackage
apparently some minimalist installs omit psmisc
needed for the killall in various %pre and %post scriptlets
smarter logic for restarting glusterd in %post server
Change-Id: I1581d278c2be6a917c20785437ce78c502111d8d
BUG: 1146624
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/8859
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | glusterfs.spec.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 255114f1177..2cee0f1585e 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -97,6 +97,7 @@ Requires(postun): systemd-units %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 @@ -113,6 +114,7 @@ Requires(postun): /sbin/service %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 @@ -267,6 +269,9 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-cli = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-fuse = %{version}-%{release} +# psmisc for killall, and nfs-utils and rpcbind/portmap for gnfs server +Requires: psmisc +Requires: nfs-utils %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) Requires: rpcbind %else @@ -751,6 +756,9 @@ if [ $? -eq 0 ]; then killall 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 @@ -774,6 +782,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Fri Jun 27 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- psmisc (and nfsutils), better %post server logic (#1146624) + * Sat Jan 4 2014 Niels de Vos <ndevos@redhat.com> - The main glusterfs package should not provide glusterfs-libs (#1048489) |