From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 19 Jun 2017 21:14:00 +0000 (-0400)
Subject: Use the correct preun command
X-Git-Tag: release_3_0_15~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=990ccd87bf6130d9915b1004e5aa08ee6cca6fd4;p=thirdparty%2Ffreeradius-server.git

Use the correct preun command
---

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 5b974ecf017..0b89aac759d 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -33,10 +33,15 @@ Group: System Environment/Daemons
 URL: http://www.freeradius.org/
 
 Source0: ftp://ftp.freeradius.org/pub/radius/freeradius-server-%{version}.tar.bz2
+%if %{?_unitdir:1}%{!?_unitdir:0}
+Source100: radiusd.service
+%else
 Source100: freeradius-radiusd-init
+%define initddir %{?_initddir:%{_initddir}}%{!?_initddir:%{_initrddir}}
+%endif
+
 Source102: freeradius-logrotate
 Source103: freeradius-pam-conf
-Source104: radiusd.service
 
 Obsoletes: freeradius-devel
 Obsoletes: freeradius-libs
@@ -473,11 +478,13 @@ fi
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/service radiusd stop > /dev/null 2>&1
+%if %{?_unitdir:1}%{!?_unitdir:0}
+  /bin/systemctl disable radiusd
+%else
   /sbin/chkconfig --del radiusd
+%endif
 fi
 
-
 %postun
 if [ $1 -ge 1 ]; then
   /sbin/service radiusd condrestart >/dev/null 2>&1 || :