summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-03-10 08:44:59 +0100
committerMichael Biebl <biebl@debian.org>2011-03-10 08:44:59 +0100
commit9ed5f29b27d82e74379f7325e7d7a18c8b0023d8 (patch)
treee7e11cfc827c1ee23432fb729479a49e21e16746
parent721a4f909f59f85a942b648636cfa29839eb8dd8 (diff)
downloadrsyslog-9ed5f29b27d82e74379f7325e7d7a18c8b0023d8.tar.gz
Remove rsyslog.socket symlink on upgrades
* debian/rsyslog.preinst - Remove old rsyslog.socket symlink from sockets.target.wants on upgrades as rsyslog uses syslog.socket now which is provided by systemd.
-rw-r--r--debian/changelog3
-rw-r--r--debian/rsyslog.preinst4
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 17460d8..201e97c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ rsyslog (5.7.8-1) UNRELEASED; urgency=low
* debian/patches/02-pmaixforwardedfrom_type_nokeep.patch
- Fix build failure in aixforwardedfrom parser module by setting the
module type to NOKEEP.
+ * debian/rsyslog.preinst
+ - Remove old rsyslog.socket symlink from sockets.target.wants on upgrades
+ as rsyslog uses syslog.socket now which is provided by systemd.
-- Michael Biebl <biebl@debian.org> Wed, 09 Mar 2011 22:21:10 +0100
diff --git a/debian/rsyslog.preinst b/debian/rsyslog.preinst
index ef0f856..fce810f 100644
--- a/debian/rsyslog.preinst
+++ b/debian/rsyslog.preinst
@@ -6,6 +6,10 @@ if [ "$1" = "install" -a -n "$2" ] ; then
[ -f /etc/logrotate.d/rsyslog.disabled ] && mv -f /etc/logrotate.d/rsyslog.disabled /etc/logrotate.d/rsyslog
fi
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt "5.7.8-1" ; then
+ rm -f /etc/systemd/system/sockets.target.wants/rsyslog.socket
+fi
+
#DEBHELPER#
exit 0