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