andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

eventsapi/packaging: Fix wrong usage of %post

Browse Source 
%postun was used for events package instead of %post. eventsd
service should be restarted only after install/upgrade and not
during uninstallation(%postun)

BUG: 1386141
Change-Id: Iae3eab06d02c5f4134b3de09f040123bed053bb8
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/15670
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
This commit is contained in:
Aravinda VK 2016-10-18 14:57:47 +05:30
parent 8f8e23b014
commit ee4c768daf
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -113,3 +113,5 @@ events/src/eventsapiconf.py
extras/systemd/glustereventsd.service
events/src/eventtypes.py
libglusterfs/src/eventtypes.h
extras/init.d/glustereventsd-FreeBSD
extras/init.d/glustereventsd-Redhat

25
glusterfs.spec.in
View File

@ -111,6 +111,7 @@
# can't seem to make a generic macro that works
%global _init_glusterd %{_unitdir}/glusterd.service
%global _init_glusterfsd %{_unitdir}/glusterfsd.service
%global _init_glustereventsd %{_unitdir}/glustereventsd.service
%else
%global _init_enable() /sbin/chkconfig --add %1 ;
%global _init_disable() /sbin/chkconfig --del %1 ;
@ -121,6 +122,7 @@
# can't seem to make a generic macro that works
%global _init_glusterd %{_sysconfdir}/init.d/glusterd
%global _init_glusterfsd %{_sysconfdir}/init.d/glusterfsd
%global _init_glustereventsd %{_sysconfdir}/init.d/glustereventsd
%endif
%if ( 0%{_for_fedora_koji_builds} )
@ -775,6 +777,11 @@ exit 0
%post api
/sbin/ldconfig
%if ( 0%{!?_without_events:1} )
%post events
%_init_restart glustereventsd
%endif
%if ( 0%{?rhel} == 5 )
%post fuse
modprobe fuse
@ -871,6 +878,17 @@ exit 0
##-----------------------------------------------------------------------------
## All %%preun should be placed here and keep them sorted
##
%if ( 0%{!?_without_events:1} )
%preun events
if [ $1 -eq 0 ]; then
if [ -f %_init_glustereventsd ]; then
%_init_stop glustereventsd
%_init_disable glustereventsd
fi
fi
exit 0
%endif
%preun server
if [ $1 -eq 0 ]; then
if [ -f %_init_glusterfsd ]; then
@ -904,13 +922,6 @@ exit 0
%postun api
/sbin/ldconfig
%postun events
%if ( 0%{!?_without_events:1} )
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
%_init_restart glustereventsd
%endif
%endif
%postun libs
/sbin/ldconfig