ppp: Re-add ifname patch

[people/ms/ipfire-3.x.git] / rsyslog / rsyslog.nm

diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm
index 1f2aef3d904e26a23b5fde84a0f3e8b1624f0ac2..1956a38d224aa7748c3b368196cc642d5a2db027 100644 (file)
--- a/rsyslog/rsyslog.nm
+++ b/rsyslog/rsyslog.nm
@@ -5,7 +5,7 @@
 
 name       = rsyslog
 version    = 5.8.6
-release    = 2
+release    = 4
 
 groups     = System/Daemons
 url        = http://www.rsyslog.com/
@@ -35,8 +35,6 @@ build
                -DSYSLOGD_PIDNAME=\"syslogd.pid\"
 
        configure_options += \
-               --exec-prefix= \
-               --libdir=/lib \
                --with-systemdsystemunitdir=/lib/systemd/system \
                --disable-static \
                --disable-testbench \
@@ -76,8 +74,6 @@ packages
                                [ -f "${n}" ] && continue
                                umask 066 && touch ${n}
                        done
-
-                       /bin/systemctl enable rsyslog.service >/dev/null 2>&1 || :
                end
 
                script preun
@@ -89,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