From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 29 Jul 2012 13:06:01 +0000 (+0200)
Subject: rsyslog: Don't automatically enable this service anymore.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf106a2116fe4643499d8afa5b5e68e19d63f465;p=ipfire-3.x.git

rsyslog: Don't automatically enable this service anymore.

As a result after the movement to journald as logging daemon we don't
want to autostart the rsyslog after reboot.

Fixes #10199.
---

diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm
index 70ceb9499..1956a38d2 100644
--- a/rsyslog/rsyslog.nm
+++ b/rsyslog/rsyslog.nm
@@ -5,7 +5,7 @@
 
 name       = rsyslog
 version    = 5.8.6
-release    = 3
+release    = 4
 
 groups     = System/Daemons
 url        = http://www.rsyslog.com/
@@ -74,8 +74,6 @@ packages
 				[ -f "${n}" ] && continue
 				umask 066 && touch ${n}
 			done
-
-			/bin/systemctl enable rsyslog.service >/dev/null 2>&1 || :
 		end
 
 		script preun
@@ -87,9 +85,12 @@ packages
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 
+		# Disable and stop rsyslog after update, because we use the
+		# journal daemon from systemd from now.
 		script postup
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-			/bin/systemctl try-restart rsyslog.service >/dev/null 2>&1 || :
+			/bin/systemctl disable rsyslog.service >/dev/null 2>&1 || :
+			/bin/systemctl stop rsyslog.service >/dev/null 2>&1 || :
 		end
 	end