diff options
| author | Michael Biebl <biebl@debian.org> | 2013-03-05 23:05:42 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-03-05 23:05:46 +0100 |
| commit | 75464369825fe1103bf261f2a60156e67e7d6efc (patch) | |
| tree | c1bea23d5408df16d7527f6783c69274fe73d79c | |
| parent | 17a09eb8d8d23bdfa404ebb32bbcf57d0ecf6145 (diff) | |
| download | rsyslog-75464369825fe1103bf261f2a60156e67e7d6efc.tar.gz | |
Update rsyslog service file for the journal
debian/patches/04-systemd_journal.patch: The journal has replaced
systemd-kmsg-syslogd and systemd-stdout-bridge. Stopping a non-existing
service will generate an error in newer versions of systemd, so remove
that from ExecStartPre.
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/04-systemd_journal.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ff6eca0..7afdb62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +rsyslog (5.8.11-3) UNRELEASED; urgency=low + + * debian/patches/04-systemd_journal.patch: The journal has replaced + systemd-kmsg-syslogd and systemd-stdout-bridge. Stopping a non-existing + service will generate an error in newer versions of systemd, so remove + that from ExecStartPre. + + -- Michael Biebl <biebl@debian.org> Tue, 05 Mar 2013 23:03:20 +0100 + rsyslog (5.8.11-2) unstable; urgency=low * Disable omstdout module again. Upstream doesn't consider it viable for diff --git a/debian/patches/04-systemd_journal.patch b/debian/patches/04-systemd_journal.patch new file mode 100644 index 0000000..87b7ac1 --- /dev/null +++ b/debian/patches/04-systemd_journal.patch @@ -0,0 +1,19 @@ +Description: Update for systemd journal + The journal that was introduced in systemd v38 has replaced + systemd-kmsg-syslogd and systemd-stdout-bridge. + Stopping a non-existing service will generate a failure in newer + versions of systemd and since wheezy has systemd v44, it's best + to remove that ExecStartPre. +Author: Michael Biebl <biebl@debian.org> +Index: rsyslog/rsyslog.service.in +=================================================================== +--- rsyslog.orig/rsyslog.service.in 2013-03-05 19:12:26.579631305 +0100 ++++ rsyslog/rsyslog.service.in 2013-03-05 22:57:35.377856176 +0100 +@@ -2,7 +2,6 @@ + Description=System Logging Service + + [Service] +-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service + ExecStart=@sbindir@/rsyslogd -n -c5 + Sockets=syslog.socket + StandardOutput=null diff --git a/debian/patches/series b/debian/patches/series index d985f46..aa55a18 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 01-dont_create_db.patch 02-path_max.patch 03-fix_relp_dns_resolution.patch +04-systemd_journal.patch |