diffstat of debian/ for systemd_215-4 systemd_215-4tanglu1 changelog | 24 ++++++++++++++++++++++++ control | 2 +- systemd.postinst | 19 +++++++++---------- tmpfiles.d/debian.conf | 1 + 4 files changed, 35 insertions(+), 11 deletions(-) --- systemd-215/debian/changelog 2014-09-15 15:38:44.000000000 +0000 +++ systemd-215/debian/changelog 2014-09-20 14:01:26.000000000 +0000 @@ -1,3 +1,13 @@ +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. @@ -238,6 +248,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 ] @@ -1269,3 +1292,4 @@ * Initial release, upload to experimental. Closes: #580814 -- Tollef Fog Heen Fri, 30 Apr 2010 21:02:25 +0200 + --- systemd-215/debian/control 2014-09-15 15:38:44.000000000 +0000 +++ systemd-215/debian/control 2014-09-20 13:59:43.000000000 +0000 @@ -76,7 +76,7 @@ Package: systemd-sysv Architecture: linux-any Section: admin -Priority: extra +Priority: required Conflicts: sysvinit-core, upstart Replaces: sysvinit (<< 2.88dsf-44~), --- systemd-215/debian/systemd.postinst 2014-09-15 15:38:44.000000000 +0000 +++ systemd-215/debian/systemd.postinst 2014-09-20 13:57:27.000000000 +0000 @@ -112,16 +112,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 # Re-run systemctl enable for any service that was enabled when preinst was run. if dpkg --compare-versions "$2" ge "204"; then --- systemd-215/debian/tmpfiles.d/debian.conf 2014-09-15 15:38:44.000000000 +0000 +++ systemd-215/debian/tmpfiles.d/debian.conf 2014-09-20 13:55:39.000000000 +0000 @@ -8,5 +8,6 @@ # See tmpfiles.d(5) for details # Type Path Mode UID GID Age Argument +L /run/shm - - - - /dev/shm L /run/initctl - - - - /run/systemd/initctl/fifo d /run/sendsigs.omit.d 0755 root root -