diffstat of debian/ for systemd_215-8 systemd_215-8tanglu1 changelog | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ control | 4 ++-- systemd.postinst | 19 +++++++++---------- 3 files changed, 59 insertions(+), 12 deletions(-) --- systemd-215/debian/changelog 2014-12-05 09:01:35.000000000 +0000 +++ systemd-215/debian/changelog 2014-12-05 17:44:10.000000000 +0000 @@ -1,3 +1,14 @@ +systemd (215-8tanglu1) staging; urgency=medium + + * Merge with Debian unstable, remaining changes: + - Enable persistent journald logging by default. + - Make systemd-sysv a required package. + - Make libpam-systemd prefer systemd-sysv over systemd-shim + + The shim is completely unsupported in Tanglu at time, and + we don't want it to be installed accidentally. + + -- Matthias Klumpp Fri, 05 Dec 2014 18:43:06 +0100 + systemd (215-8) unstable; urgency=medium [ Didier Roche ] @@ -66,6 +77,19 @@ -- Martin Pitt Fri, 28 Nov 2014 06:43:15 +0100 +systemd (215-6tanglu1) staging; urgency=medium + + * Merge with Debian unstable + * Add /run/shm -> /dev/shm symlink in debian/tmpfiles.d/debian.conf + (Closes: #674755). + * Enable persistent journald logging by default. + * Make systemd-sysv a required package. + * Make libpam-systemd prefer systemd-sysv over systemd-shim + - The shim is completely unsupported in Tanglu at time, and + we don't want it to be installed accidentally. + + -- Matthias Klumpp Sun, 23 Nov 2014 17:04:26 +0100 + systemd (215-6) unstable; urgency=medium [ Martin Pitt ] @@ -129,6 +153,16 @@ -- Michael Biebl Sat, 27 Sep 2014 17:49:47 +0200 +systemd (215-4tanglu1) staging; urgency=medium + + * Merge with Debian unstable + * Add /run/shm -> /dev/shm symlink in debian/tmpfiles.d/debian.conf + (Closes: #674755). + * Enable persistent journald logging by default. + * Make systemd-sysv a required package. + + -- Matthias Klumpp Sat, 20 Sep 2014 15:58:46 +0200 + systemd (215-4) unstable; urgency=medium * Upload to unstable. @@ -369,6 +403,19 @@ -- Martin Pitt Wed, 06 Aug 2014 13:33:22 +0200 +systemd (208-6tanglu2) staging; urgency=medium + + * Remove pre-generated rules and unit files in debian/rules clean target. + * Add /run/shm -> /dev/shm symlink in debian/tmpfiles.d/debian.conf + (Closes: #674755). + * Map init script dependencies on cryptdisks, mountall, and mountnfs + to the corresponding systemd targets. + * Map SysV runlevel S to basic.target, not sysinit.target. + * Enable persistent journald logging by default. + * Make systemd and systemd-sysv required packages. + + -- Jon Severinsson Sun, 13 Jul 2014 18:00:00 +0200 + systemd (208-6) unstable; urgency=medium [ Jon Severinsson ] @@ -1400,3 +1447,4 @@ * Initial release, upload to experimental. Closes: #580814 -- Tollef Fog Heen Fri, 30 Apr 2010 21:02:25 +0200 + --- systemd-215/debian/control 2014-12-05 09:01:35.000000000 +0000 +++ systemd-215/debian/control 2014-12-05 17:46:27.000000000 +0000 @@ -78,7 +78,7 @@ Package: systemd-sysv Architecture: linux-any Section: admin -Priority: extra +Priority: required Conflicts: sysvinit-core, upstart Replaces: sysvinit (<< 2.88dsf-44~), @@ -112,7 +112,7 @@ systemd (= ${binary:Version}), libpam-runtime (>= 1.0.1-6), dbus, - systemd-shim (>= 8-2) | systemd-sysv + systemd-sysv | systemd-shim (>= 8-2) Description: system and service manager - PAM module systemd is a replacement for sysvinit. It is dependency-based and able to read the LSB init script headers in addition to parsing rcN.d --- systemd-215/debian/systemd.postinst 2014-12-05 09:01:35.000000000 +0000 +++ systemd-215/debian/systemd.postinst 2014-12-05 17:45:25.000000000 +0000 @@ -104,16 +104,15 @@ # Make systemd-detect-virt utility usable for non-root users setcap cap_dac_override,cap_sys_ptrace=ep /usr/bin/systemd-detect-virt || true -# We don’t ship /var/log/journal currently, so only run the following fix for -# systems where the administrator has explicitly enabled persistent logging by -# creating /var/log/journal. -if [ -d /var/log/journal ]; then - # Grant read access to /var/log/journal for members of the adm group - # via a filesystem ACL. This makes them able to read the journal. - # Failure is ignored since there might be file systems mounted without - # ACL support. - setfacl -R -nm g:adm:rx,d:g:adm:rx /var/log/journal || true -fi +# Install systemd journal directory with appropriate permissions +# to enable persistent logging. +install -d -g systemd-journal /var/log/journal + +# Grant read access to /var/log/journal for members of the adm group +# via a filesystem ACL. This makes them able to read the journal. +# Failure is ignored since there might be file systems mounted without +# ACL support. +setfacl -R -nm g:adm:rx,d:g:adm:rx /var/log/journal || true if [ -n "$2" ]; then _systemctl daemon-reexec || true