summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-02-12 19:43:01 +0100
committerMichael Biebl <biebl@debian.org>2012-02-12 19:53:49 +0100
commit78a4ef74d63156c19e6342e41f28106c6c310bcb (patch)
tree3b0ceb43a045aef5fc450196bc0bdcf986e0a8a1
parentf4268eccb9ed71df5ed36757f297f60bc14e11f1 (diff)
downloadrsyslog-78a4ef74d63156c19e6342e41f28106c6c310bcb.tar.gz
Install tmpfiles.d snippet to create /dev/xconsole when running systemd. (Closes: #634978)
-rw-r--r--debian/changelog2
-rw-r--r--debian/rsyslog-doc.install4
-rw-r--r--debian/rsyslog.install3
-rw-r--r--debian/xconsole.conf1
4 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b4cbf5..071f83b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ rsyslog (5.8.7-1) UNRELEASED; urgency=low
added in version 1.16.1, not 1.6.1. (Closes: #654894)
* Update watch file. Check download page for stable releases.
* Strip debian/tmp/ from .install files.
+ * Install tmpfiles.d snippet to create /dev/xconsole when running systemd.
+ (Closes: #634978)
-- Michael Biebl <biebl@debian.org> Sun, 12 Feb 2012 11:22:26 +0100
diff --git a/debian/rsyslog-doc.install b/debian/rsyslog-doc.install
index 4b11c69..57a07f8 100644
--- a/debian/rsyslog-doc.install
+++ b/debian/rsyslog-doc.install
@@ -1,4 +1,4 @@
doc/*.html usr/share/doc/rsyslog-doc/html/
-doc/*.jpg usr/share/doc/rsyslog-doc/html/
-doc/*.png usr/share/doc/rsyslog-doc/html/
+doc/*.jpg usr/share/doc/rsyslog-doc/html/
+doc/*.png usr/share/doc/rsyslog-doc/html/
doc/*.conf usr/share/doc/rsyslog-doc/html/
diff --git a/debian/rsyslog.install b/debian/rsyslog.install
index fba3cd0..5ef1f4b 100644
--- a/debian/rsyslog.install
+++ b/debian/rsyslog.install
@@ -1,4 +1,5 @@
-debian/rsyslog.conf /etc/
+debian/rsyslog.conf etc/
+debian/xconsole.conf usr/lib/tmpfiles.d/
usr/sbin/
usr/share/man/
usr/lib/rsyslog/imfile.so
diff --git a/debian/xconsole.conf b/debian/xconsole.conf
new file mode 100644
index 0000000..f4aecd3
--- /dev/null
+++ b/debian/xconsole.conf
@@ -0,0 +1 @@
+p /dev/xconsole 0640 root adm