diffstat for systemd-204 systemd-204 changelog | 99 ++++++++++ control | 4 patches/Map-SysV-runlevel-S-to-basic.target-not-sysinit.targ.patch | 22 ++ patches/series | 1 systemd.postinst | 5 5 files changed, 129 insertions(+), 2 deletions(-) diff -Nru systemd-204/debian/changelog systemd-204/debian/changelog --- systemd-204/debian/changelog 2014-06-28 11:23:46.000000000 +0000 +++ systemd-204/debian/changelog 2014-07-07 10:21:07.000000000 +0000 @@ -1,3 +1,12 @@ +systemd (204-14tanglu0.1) aequorea-updates; urgency=medium + + * Merge from Debian, remaining changes: + - Make systemd and systemd-sysv required packages. + - Enable persistent journald logging by default. + - Map SysV runlevel S to basic.target, not sysinit.target. + + -- Jon Severinsson Sun, 06 Jul 2014 18:00:00 +0200 + systemd (204-14) unstable; urgency=medium * Fix SIGABRT in insserv generator caused by incorrect usage of strcat(). @@ -213,6 +222,17 @@ -- Michael Biebl Wed, 19 Mar 2014 18:57:35 +0100 +systemd (204-7tanglu1) staging; urgency=medium + + * Merge with Debian unstable, remaining changes: + - Explicitly depend on newer libaudit + - Make systemd and systemd-sysv required packages + - Enable persistent journald logging + * Map SysV runlevel S to basic.target, not sysinit.target. + - Debian specific change, upstream does not map runlevel S to any target. + + -- Jon Severinsson Fri, 14 Feb 2014 10:00:00 +0100 + systemd (204-7) unstable; urgency=low * fix systemctl enable/disable/… error message “Failed to issue method call: @@ -229,6 +249,20 @@ -- Michael Stapelberg Tue, 11 Feb 2014 23:34:42 +0100 +systemd (204-6tanglu2) staging; urgency=low + + * Enable persistent journald logging + + -- Matthias Klumpp Sun, 12 Jan 2014 18:14:26 +0100 + +systemd (204-6tanglu1) staging; urgency=low + + * Merge with Debian unstable, remaining changes: + - Explicitly depend on newer libaudit + - Make systemd and systemd-sysv required packages + + -- Matthias Klumpp Tue, 07 Jan 2014 12:08:34 +0100 + systemd (204-6) unstable; urgency=low [ Michael Stapelberg ] @@ -264,6 +298,14 @@ -- Michael Stapelberg Tue, 31 Dec 2013 14:39:44 +0100 +systemd (204-5tanglu1) staging; urgency=low + + * Merge with Debian unstable, remaining changes: + - Explicitly depend on newer libaudit + - Make systemd and sysv-compat required packages + + -- Matthias Klumpp Sun, 01 Dec 2013 20:26:34 +0100 + systemd (204-5) unstable; urgency=high * Cherry-pick 72fd713 from upstream which fixes insecure calling of polkit @@ -272,6 +314,15 @@ -- Michael Biebl Mon, 23 Sep 2013 11:59:53 +0200 +systemd (204-4tanglu1) staging; urgency=low + + * Merge with debian unstable, remaining changes: + - mount /dev as devtmpfs, not tmpfs + - Explicitly depend on newer libaudit + - systemd is a required component + + -- Matthias Klumpp Tue, 17 Sep 2013 21:40:16 -0700 + systemd (204-4) unstable; urgency=low * Add preinst check to abort udev upgrade if the currently running kernel @@ -328,6 +379,15 @@ -- Michael Biebl Thu, 12 Sep 2013 00:13:11 +0200 +systemd (204-2tanglu1) aequorea; urgency=low + + * Merge with debian experimental, remaining changes: + - mount /dev as devtmpfs, not tmpfs + - Adjust maintscript version-numbers to Tanglu packaging + - systemd is a required component + + -- Philip Muškovac Sat, 27 Jul 2013 14:12:08 +0200 + systemd (204-2) experimental; urgency=low [ Daniel Schaal ] @@ -448,6 +508,45 @@ -- Michael Biebl Thu, 20 Jun 2013 01:32:16 +0200 +systemd (204-0tanglu2) aequorea; urgency=low + + * Adjust maintscript version-numbers to Tanglu packaging + * Remove obsolete udev-mtab init-script + - Thanks to Michael Biebl for the hint! + + -- Matthias Klumpp Fri, 19 Jul 2013 18:54:49 +0200 + +systemd (204-0tanglu1) aequorea; urgency=low + + * New upstream release + + -- Matthias Klumpp Fri, 28 Jun 2013 22:48:52 +0200 + +systemd (201-0tanglu4) aequorea; urgency=low + + * Make sure debian-fixup.service runs after systemd-remount-fs.service, + which has been renamed. + + -- Matthias Klumpp Thu, 23 May 2013 22:28:45 +0200 + +systemd (201-0tanglu3) aequorea; urgency=low + + * debian/extra/udev.startup: Mount /dev as devtmpfs instead of tmpfs + + -- Philip MuÅ¡kovac Tue, 21 May 2013 01:47:17 +0200 + +systemd (201-0tanglu2) aequorea; urgency=low + + * Make systemd a required component + + -- Matthias Klumpp Sat, 27 Apr 2013 22:55:46 +0200 + +systemd (201-0tanglu1) aequorea; urgency=low + + * Build for Tanglu, adjusting dependencies + + -- Matthias Klumpp Tue, 23 Apr 2013 20:16:45 +0200 + systemd (44-11) unstable; urgency=low * Team upload. diff -Nru systemd-204/debian/control systemd-204/debian/control --- systemd-204/debian/control 2014-06-28 11:23:46.000000000 +0000 +++ systemd-204/debian/control 2014-07-07 10:21:06.000000000 +0000 @@ -43,7 +43,7 @@ Package: systemd Architecture: linux-any Section: admin -Priority: optional +Priority: required Recommends: libpam-systemd Suggests: systemd-ui Pre-Depends: ${misc:Pre-Depends} @@ -75,7 +75,7 @@ Package: systemd-sysv Architecture: linux-any Section: admin -Priority: extra +Priority: required Conflicts: sysvinit-core, upstart Replaces: sysvinit (<< 2.88dsf-44~), diff -Nru systemd-204/debian/patches/Map-SysV-runlevel-S-to-basic.target-not-sysinit.targ.patch systemd-204/debian/patches/Map-SysV-runlevel-S-to-basic.target-not-sysinit.targ.patch --- systemd-204/debian/patches/Map-SysV-runlevel-S-to-basic.target-not-sysinit.targ.patch 1970-01-01 00:00:00.000000000 +0000 +++ systemd-204/debian/patches/Map-SysV-runlevel-S-to-basic.target-not-sysinit.targ.patch 2014-07-07 10:21:07.000000000 +0000 @@ -0,0 +1,22 @@ +From: Jon Severinsson +Date: Wed, 2 Apr 2014 15:00:00 +0200 +Subject: Map SysV runlevel S to basic.target, not sysinit.target. + +Debian specific change, upstream does not map runlevel S to any target. +--- + src/core/service.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/service.c b/src/core/service.c +index dda34a7..268f687 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -69,7 +69,7 @@ static const struct { + { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, + + /* Debian style rcS.d */ +- { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, ++ { "rcS.d", SPECIAL_BASIC_TARGET, RUNLEVEL_SYSINIT }, + + /* Standard SysV runlevels for shutdown */ + { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, diff -Nru systemd-204/debian/patches/series systemd-204/debian/patches/series --- systemd-204/debian/patches/series 2014-06-28 11:23:46.000000000 +0000 +++ systemd-204/debian/patches/series 2014-07-07 10:21:07.000000000 +0000 @@ -59,3 +59,4 @@ libudev-fix-memleak-when-enumerating-childs.patch Add-run-initctl-support-to-SysV-compat-tools.patch core-transaction-fix-cycle-break-attempts-outside-tr.patch +Map-SysV-runlevel-S-to-basic.target-not-sysinit.targ.patch diff -Nru systemd-204/debian/systemd.postinst systemd-204/debian/systemd.postinst --- systemd-204/debian/systemd.postinst 2014-06-28 11:23:46.000000000 +0000 +++ systemd-204/debian/systemd.postinst 2014-07-07 10:21:06.000000000 +0000 @@ -98,9 +98,14 @@ # initial update of the Message Catalogs database _update_catalog +# Install systemd journal directory with appropriate permissions +# to enable persistent logging. +install -d -g systemd-journal /var/log/journal + # 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. +# NOTE: On Tanglu, this is enabled by default 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.