diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2014-09-25 09:45:24 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-09-27 01:40:04 -0700 |
| commit | d26442a2a6319602c2eec0ff10eca3bc73f9eb78 (patch) | |
| tree | 6bf86bc0fab624f807072a64ef42bab2f0706ea8 /glusterfs.spec.in | |
| parent | f206732faafa44b9224f21e6e959b6c3f54e5b34 (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: I938849de91c9d1ea5fb6ad03a2be2125ab6c3aa8
BUG: 1145000
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/8858
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com>
Tested-by: Lalatendu Mohanty <lmohanty@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index fb6b9a2e3ba..ba590430aba 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -122,6 +122,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 @@ -138,6 +139,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 @@ -315,7 +317,8 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-cli = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-fuse = %{version}-%{release} -# nfs-utils provides rpc.statd and it is a requirement for gluster-nfs +# 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 @@ -942,6 +945,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 @@ -965,6 +971,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Thu Sep 25 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- smarter logic in %%post server (#1145000) + * Fri Jun 27 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com> - killall --wait in %%post server (#1113959, #1113745) |