14f8ab
From 850d5418fb48417d94ab17e565b2184ba951ccbe Mon Sep 17 00:00:00 2001
14f8ab
From: Mohit Agrawal <moagrawa@redhat.com>
14f8ab
Date: Wed, 17 Apr 2019 18:04:44 +0530
14f8ab
Subject: [PATCH 113/124] spec: Glusterd did not start by default after node
14f8ab
 reboot
14f8ab
14f8ab
Problem: After install gluster rpms glusterd service is not enabled
14f8ab
         so systemctl status is showing "disabled"
14f8ab
14f8ab
Solution: Update glusterfs.spec.in to enable glusterd after install
14f8ab
          gluster rpms
14f8ab
14f8ab
label: DOWNSTREAM ONLY
14f8ab
BUG: 1699835
14f8ab
14f8ab
Change-Id: Ied9be5dfb1bf3bda24868722b1fbd77cb1c1d18c
14f8ab
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/168168
14f8ab
Reviewed-by: Kaleb Keithley <kkeithle@redhat.com>
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
14f8ab
---
14f8ab
 glusterfs.spec.in | 10 ++++++----
14f8ab
 1 file changed, 6 insertions(+), 4 deletions(-)
14f8ab
14f8ab
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
14f8ab
index cb17eaa..ba095b7 100644
14f8ab
--- a/glusterfs.spec.in
14f8ab
+++ b/glusterfs.spec.in
14f8ab
@@ -168,6 +168,8 @@
14f8ab
 %endif
14f8ab
 
14f8ab
 %if ( 0%{?_with_systemd:1} )
14f8ab
+%global service_enable()   /bin/systemctl --quiet enable %1.service || : \
14f8ab
+%{nil}
14f8ab
 %global service_start()   /bin/systemctl --quiet start %1.service || : \
14f8ab
 %{nil}
14f8ab
 %global service_stop()    /bin/systemctl --quiet stop %1.service || :\
14f8ab
@@ -181,7 +183,7 @@
14f8ab
 %global glustereventsd_svcfile %{_unitdir}/glustereventsd.service
14f8ab
 %global glusterfssharedstorage_svcfile %{_unitdir}/glusterfssharedstorage.service
14f8ab
 %else
14f8ab
-%global systemd_post()  /sbin/chkconfig --add %1 >/dev/null 2>&1 || : \
14f8ab
+%global service_enable()  /sbin/chkconfig --add %1 >/dev/null 2>&1 || : \
14f8ab
 %{nil}
14f8ab
 %global systemd_preun() /sbin/chkconfig --del %1 >/dev/null 2>&1 || : \
14f8ab
 %{nil}
14f8ab
@@ -926,7 +928,7 @@ exit 0
14f8ab
 
14f8ab
 %if ( 0%{!?_without_events:1} )
14f8ab
 %post events
14f8ab
-%systemd_post glustereventsd
14f8ab
+%service_enable glustereventsd
14f8ab
 %endif
14f8ab
 
14f8ab
 %if ( 0%{!?_without_server:1} )
14f8ab
@@ -951,9 +953,9 @@ exit 0
14f8ab
 %if ( 0%{!?_without_server:1} )
14f8ab
 %post server
14f8ab
 # Legacy server
14f8ab
-%systemd_post glusterd
14f8ab
+%service_enable glusterd
14f8ab
 %if ( 0%{_for_fedora_koji_builds} )
14f8ab
-%systemd_post glusterfsd
14f8ab
+%service_enable glusterfsd
14f8ab
 %endif
14f8ab
 # ".cmd_log_history" is renamed to "cmd_history.log" in GlusterFS-3.7 .
14f8ab
 # While upgrading glusterfs-server package form GlusterFS version <= 3.6 to
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab