diffstat for systemd-208 systemd-208 changelog | 13 +++++ control | 8 +-- patches/Avoid-reload-and-re-start-requests-during-early-boot.patch | 8 +-- patches/Map-init-script-dependencies-on-cryptdisks-mountall-.patch | 24 ++++++++++ patches/Revert-service-drop-support-for-SysV-scripts-for-the.patch | 2 patches/series | 1 rules | 6 ++ systemd.postinst | 19 +++---- tmpfiles.d/debian.conf | 1 9 files changed, 63 insertions(+), 19 deletions(-) diff -Nru systemd-208/debian/changelog systemd-208/debian/changelog --- systemd-208/debian/changelog 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/changelog 2014-07-16 10:23:35.000000000 +0000 @@ -1,3 +1,16 @@ +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 ] diff -Nru systemd-208/debian/control systemd-208/debian/control --- systemd-208/debian/control 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/control 2014-07-16 10:23:28.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~), @@ -144,8 +144,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libsystemd-login0 (= ${binary:Version}) -Breaks: systemd (<< 204-8) -Replaces: systemd (<< 204-8) +Breaks: systemd (<< 208-5tanglu2) +Replaces: systemd (<< 208-5tanglu2) Description: systemd login utility library - development files The libsystemd-login library provides an interface for the systemd-logind service which is used to track user sessions and seats. diff -Nru systemd-208/debian/patches/Avoid-reload-and-re-start-requests-during-early-boot.patch systemd-208/debian/patches/Avoid-reload-and-re-start-requests-during-early-boot.patch --- systemd-208/debian/patches/Avoid-reload-and-re-start-requests-during-early-boot.patch 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/patches/Avoid-reload-and-re-start-requests-during-early-boot.patch 2014-07-16 10:23:27.000000000 +0000 @@ -21,14 +21,14 @@ + * An example is samba being reloaded by the dhcp hook + * when the network is activated during rcS. + * As a workaround we ignore reload or (re)start -+ * requests while sysinit.target is queued for ++ * requests while basic.target is queued for + * services which have the DefaultDependencies option + * set to yes. + * + * See http://bugs.debian.org/624599 */ -+ if (strcmp(j->unit->id, "sysinit.target") == 0 && unit->default_dependencies) { -+ log_debug("sysinit.target is queued, ignoring %s request for unit %s", job_type_to_string(type), unit->id); -+ dbus_set_error(e, BUS_ERROR_INVALID_JOB_MODE, "sysinit.target is queued, ignoring %s request for unit %s", job_type_to_string(type), unit->id); ++ if (strcmp(j->unit->id, "basic.target") == 0 && unit->default_dependencies) { ++ log_debug("basic.target is queued, ignoring %s request for unit %s", job_type_to_string(type), unit->id); ++ dbus_set_error(e, BUS_ERROR_INVALID_JOB_MODE, "basic.target is queued, ignoring %s request for unit %s", job_type_to_string(type), unit->id); + return -EINVAL; + } } diff -Nru systemd-208/debian/patches/Map-init-script-dependencies-on-cryptdisks-mountall-.patch systemd-208/debian/patches/Map-init-script-dependencies-on-cryptdisks-mountall-.patch --- systemd-208/debian/patches/Map-init-script-dependencies-on-cryptdisks-mountall-.patch 1970-01-01 00:00:00.000000000 +0000 +++ systemd-208/debian/patches/Map-init-script-dependencies-on-cryptdisks-mountall-.patch 2014-07-16 10:23:27.000000000 +0000 @@ -0,0 +1,24 @@ +From: Jon Severinsson +Date: Fri, 11 Jul 2014 02:15:37 +0200 +Subject: Map init script dependencies on cryptdisks, mountall, + and mountnfs to the corresponding systemd targets + +--- + src/core/service.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index 7648c15..a81563b 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -370,6 +370,10 @@ static int sysv_translate_facility(const char *name, const char *filename, char + "remote_fs", SPECIAL_REMOTE_FS_TARGET, + "syslog", SPECIAL_SYSLOG_TARGET, + "time", SPECIAL_TIME_SYNC_TARGET, ++ /* special rcS init scripts */ ++ "cryptdisks", "cryptsetup.target", ++ "mountall", SPECIAL_LOCAL_FS_TARGET, ++ "mountnfs", SPECIAL_REMOTE_FS_TARGET, + }; + + unsigned i; diff -Nru systemd-208/debian/patches/Revert-service-drop-support-for-SysV-scripts-for-the.patch systemd-208/debian/patches/Revert-service-drop-support-for-SysV-scripts-for-the.patch --- systemd-208/debian/patches/Revert-service-drop-support-for-SysV-scripts-for-the.patch 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/patches/Revert-service-drop-support-for-SysV-scripts-for-the.patch 2014-07-16 10:23:27.000000000 +0000 @@ -31,7 +31,7 @@ { "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-208/debian/patches/series systemd-208/debian/patches/series --- systemd-208/debian/patches/series 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/patches/series 2014-07-16 10:23:27.000000000 +0000 @@ -519,3 +519,4 @@ Adjust-systemd-user-pam-config-file-for-Debian.patch Add-run-initctl-support-to-SysV-compat-tools.patch core-transaction-fix-cycle-break-attempts-outside-tr.patch +Map-init-script-dependencies-on-cryptdisks-mountall-.patch diff -Nru systemd-208/debian/rules systemd-208/debian/rules --- systemd-208/debian/rules 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/rules 2014-07-16 10:23:12.000000000 +0000 @@ -79,6 +79,12 @@ rm -rf debian/install/ # remove pre-generated man pages so they are rebuilt rm -f man/*.[13578] + # remove pre-generated rules and unit files so they are rebuilt + rm -f rules/99-systemd.rules \ + units/emergency.service \ + units/systemd-udevd.service \ + units/systemd-udev-settle.service \ + units/systemd-udev-trigger.service # remove Python byte code files rm -f *.pyc diff -Nru systemd-208/debian/systemd.postinst systemd-208/debian/systemd.postinst --- systemd-208/debian/systemd.postinst 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/systemd.postinst 2014-07-16 10:23:27.000000000 +0000 @@ -98,16 +98,15 @@ # initial update of the Message Catalogs database _update_catalog -# 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 setcap cap_dac_override,cap_sys_ptrace=ep /usr/bin/systemd-detect-virt || true diff -Nru systemd-208/debian/tmpfiles.d/debian.conf systemd-208/debian/tmpfiles.d/debian.conf --- systemd-208/debian/tmpfiles.d/debian.conf 2014-07-15 22:44:42.000000000 +0000 +++ systemd-208/debian/tmpfiles.d/debian.conf 2014-07-16 10:23:27.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 - - - - /dev/initctl d /run/sendsigs.omit.d 0755 root root -