Package: systemd
Version: 204-1
Severity: wishlist
Tags: patch
The attached patch adds handling of Message Catalog files in
/usr/lib/systemd/catalog.
This compiles the files from /usr/lib/systemd/catalog into a
binary database, which is used by journalctl to provide
additional information for log entries. journalctl only uses
the binary database in /var/lib/systemd/catalog/database.
Call journalctl --update-catalog in systemd.postinst and when
triggered by dpkg to update the Message Catalog database.
Also add systemd.postrm to remove the database on purge.
See http://www.freedesktop.org/wiki/Software/systemd/catalog/
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (990, 'unstable'), (103, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.9.10-fglrx2 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages systemd depends on:
ii initscripts 2.88dsf-43
ii libacl1 2.2.52-1
ii libaudit0 1:1.7.18-1.1
ii libc6 2.17-7
ii libcap2 1:2.22-1.2
ii libcryptsetup4 2:1.6.1-1
ii libdbus-1-3 1.6.12-1
ii libgcrypt11 1.5.2-3
ii libkmod2 9-3
ii liblzma5 5.1.1alpha+20120614-2
ii libpam0g 1.1.3-9
ii libselinux1 2.1.13-2
ii libsystemd-daemon0 204-1
ii libsystemd-journal0 204-1
ii libudev1 204-1
ii libwrap0 7.6.q-24
ii udev 204-1
ii util-linux 2.20.1-5.5
Versions of packages systemd recommends:
ii libpam-systemd 204-1
Versions of packages systemd suggests:
pn systemd-ui <none>
-- Configuration Files:
/etc/systemd/journald.conf changed [not included]
/etc/systemd/logind.conf changed [not included]
-- no debconf information
>From d355b469246d912fa8017f3fa81bbd449b39f76d Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Sat, 20 Jul 2013 06:58:42 +0200
Subject: [PATCH] Add handling of Message Catalog files.
This compiles the files from /usr/lib/systemd/catalog into a
binary database, which is used by journalctl to provide
additional information for log entries. journalctl only uses
the binary database in /var/lib/systemd/catalog/database.
Call journalctl --update-catalog in systemd.postinst and when
triggered by dpkg to update the Message Catalog database.
Also add systemd.postrm to remove the database on purge.
See http://www.freedesktop.org/wiki/Software/systemd/catalog/
---
debian/systemd.postinst | 13 +++++++++++++
debian/systemd.postrm | 12 ++++++++++++
debian/systemd.triggers | 1 +
3 files changed, 26 insertions(+)
create mode 100644 debian/systemd.postrm
create mode 100644 debian/systemd.triggers
diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index 624cea1..77a8b55 100644
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -8,6 +8,16 @@ _systemctl() {
fi
}
+_update_catalog() {
+ journalctl --update-catalog || true
+}
+
+# Update Message Catalogs database in response to dpkg trigger
+if [ "$1" = "triggered" ]; then
+ _update_catalog
+ exit 0
+fi
+
# Cleanup state files from the auto-enabler which we used in wheezy
if dpkg --compare-versions "$2" lt "204-1"; then
rm -f /var/lib/systemd/enabled-units
@@ -69,4 +79,7 @@ fi
systemd-machine-id-setup
+# initial update of the Message Catalogs database
+_update_catalog
+
#DEBHELPER#
diff --git a/debian/systemd.postrm b/debian/systemd.postrm
new file mode 100644
index 0000000..f764cdc
--- /dev/null
+++ b/debian/systemd.postrm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ purge)
+ rm -f /var/lib/systemd/catalog/database
+ rmdir --ignore-fail-on-non-empty /var/lib/systemd/catalog 2> /dev/null || true
+ ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/systemd.triggers b/debian/systemd.triggers
new file mode 100644
index 0000000..69246ec
--- /dev/null
+++ b/debian/systemd.triggers
@@ -0,0 +1 @@
+interest-noawait /usr/lib/systemd/catalog
--
1.8.3.2
