|
 |
3604df |
From b5ac234ee8d8d4e44279cb69f9c59ccee6f5f31b Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
Date: Tue, 18 Oct 2016 14:57:47 +0530
|
|
|
3604df |
Subject: [PATCH 140/140] eventsapi/packaging: Fix wrong usage of %post
|
|
|
3604df |
|
|
|
3604df |
%postun was used for events package instead of %post. eventsd
|
|
|
3604df |
service should be restarted only after install/upgrade and not
|
|
|
3604df |
during uninstallation(%postun)
|
|
|
3604df |
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15670
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
|
|
|
3604df |
BUG: 1380605
|
|
|
3604df |
Change-Id: Iae3eab06d02c5f4134b3de09f040123bed053bb8
|
|
|
3604df |
Signed-off-by: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/88030
|
|
|
3604df |
Reviewed-by: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
glusterfs.spec.in | 31 ++++++++++++++++++++++---------
|
|
|
3604df |
2 files changed, 24 insertions(+), 9 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
3604df |
index 9501c05..28517b9 100644
|
|
|
3604df |
--- a/glusterfs.spec.in
|
|
|
3604df |
+++ b/glusterfs.spec.in
|
|
|
3604df |
@@ -131,6 +131,7 @@
|
|
|
3604df |
# can't seem to make a generic macro that works
|
|
|
3604df |
%global _init_glusterd %{_unitdir}/glusterd.service
|
|
|
3604df |
%global _init_glusterfsd %{_unitdir}/glusterfsd.service
|
|
|
3604df |
+%global _init_glustereventsd %{_unitdir}/glustereventsd.service
|
|
|
3604df |
%else
|
|
|
3604df |
%global _init_enable() /sbin/chkconfig --add %1 ;
|
|
|
3604df |
%global _init_disable() /sbin/chkconfig --del %1 ;
|
|
|
3604df |
@@ -141,6 +142,7 @@
|
|
|
3604df |
# can't seem to make a generic macro that works
|
|
|
3604df |
%global _init_glusterd %{_sysconfdir}/init.d/glusterd
|
|
|
3604df |
%global _init_glusterfsd %{_sysconfdir}/init.d/glusterfsd
|
|
|
3604df |
+%global _init_glustereventsd %{_sysconfdir}/init.d/glustereventsd
|
|
|
3604df |
%endif
|
|
|
3604df |
|
|
|
3604df |
%if ( 0%{_for_fedora_koji_builds} )
|
|
|
3604df |
@@ -811,6 +813,13 @@ exit 0
|
|
|
3604df |
%post api
|
|
|
3604df |
/sbin/ldconfig
|
|
|
3604df |
|
|
|
3604df |
+%if ( 0%{?_build_server} )
|
|
|
3604df |
+%if ( 0%{!?_without_events:1} )
|
|
|
3604df |
+%post events
|
|
|
3604df |
+%_init_restart glustereventsd
|
|
|
3604df |
+%endif
|
|
|
3604df |
+%endif
|
|
|
3604df |
+
|
|
|
3604df |
%if ( 0%{?rhel} == 5 )
|
|
|
3604df |
%post fuse
|
|
|
3604df |
modprobe fuse
|
|
|
3604df |
@@ -911,6 +920,19 @@ fi
|
|
|
3604df |
## All %%preun should be placed here and keep them sorted
|
|
|
3604df |
##
|
|
|
3604df |
%if ( 0%{?_build_server} )
|
|
|
3604df |
+%if ( 0%{!?_without_events:1} )
|
|
|
3604df |
+%preun events
|
|
|
3604df |
+if [ $1 -eq 0 ]; then
|
|
|
3604df |
+ if [ -f %_init_glustereventsd ]; then
|
|
|
3604df |
+ %_init_stop glustereventsd
|
|
|
3604df |
+ %_init_disable glustereventsd
|
|
|
3604df |
+ fi
|
|
|
3604df |
+fi
|
|
|
3604df |
+exit 0
|
|
|
3604df |
+%endif
|
|
|
3604df |
+%endif
|
|
|
3604df |
+
|
|
|
3604df |
+%if ( 0%{?_build_server} )
|
|
|
3604df |
%preun server
|
|
|
3604df |
if [ $1 -eq 0 ]; then
|
|
|
3604df |
if [ -f %_init_glusterfsd ]; then
|
|
|
3604df |
@@ -944,15 +966,6 @@ fi
|
|
|
3604df |
%postun api
|
|
|
3604df |
/sbin/ldconfig
|
|
|
3604df |
|
|
|
3604df |
-%if 0%{?_build_server}
|
|
|
3604df |
-%postun events
|
|
|
3604df |
-%if ( 0%{!?_without_events:1} )
|
|
|
3604df |
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
|
|
3604df |
-%_init_restart glustereventsd
|
|
|
3604df |
-%endif
|
|
|
3604df |
-%endif
|
|
|
3604df |
-%endif
|
|
|
3604df |
-
|
|
|
3604df |
%postun libs
|
|
|
3604df |
/sbin/ldconfig
|
|
|
3604df |
|
|
|
3604df |
--
|
|
|
3604df |
2.7.4
|
|
|
3604df |
|