Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package systemd
It contains two important fixes regarding the service-auto-enabler that
was added in 44-9. The failure to properly uninstall (purge) I would
consider RC.
The complete changelog is
systemd (44-11) unstable; urgency=low
* Team upload.
* Run debian-enable-units.service after sysinit.target to ensure our tmp
files aren't nuked by systemd-tmpfiles.
* The mountoverflowtmp SysV init script no longer exists so remove that
from remount-rootfs.service to avoid an unnecessary diff to upstream.
* Do not fail on purge if /var/lib/systemd is empty and has been removed
by dpkg.
-- Michael Biebl <bi...@debian.org> Wed, 13 Mar 2013 08:03:06 +0100
Diff between 44-10 and 44-11 attached.
Thanks,
Michael
unblock systemd/44-11
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index e89a411..7ebf66c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+systemd (44-11) unstable; urgency=low
+
+ * Team upload.
+ * Run debian-enable-units.service after sysinit.target to ensure our tmp
+ files aren't nuked by systemd-tmpfiles.
+ * The mountoverflowtmp SysV init script no longer exists so remove that
+ from remount-rootfs.service to avoid an unnecessary diff to upstream.
+ * Do not fail on purge if /var/lib/systemd is empty and has been removed
+ by dpkg.
+
+ -- Michael Biebl <bi...@debian.org> Wed, 13 Mar 2013 08:03:06 +0100
+
systemd (44-10) unstable; urgency=low
* Team upload.
diff --git a/debian/debian-enable-units.service b/debian/debian-enable-units.service
index 8d5e136..3396eda 100644
--- a/debian/debian-enable-units.service
+++ b/debian/debian-enable-units.service
@@ -2,8 +2,8 @@
Description=Automatically Enable Systemd Units
ConditionPathExists=/var/lib/systemd/run-debian-enable-units
DefaultDependencies=no
-Wants=local-fs.target
-After=local-fs.target
+Wants=sysinit.target
+After=sysinit.target
[Service]
ExecStart=/lib/systemd/debian-enable-units
diff --git a/debian/systemd.links b/debian/systemd.links
index c41bead..f88e6b3 100644
--- a/debian/systemd.links
+++ b/debian/systemd.links
@@ -57,7 +57,8 @@
# Run fixups early
/lib/systemd/system/debian-fixup.service /lib/systemd/system/sysinit.target.wants/debian-fixup.service
-/lib/systemd/system/debian-enable-units.service /lib/systemd/system/sysinit.target.wants/debian-enable-units.service
+# debian-enable-units requires a ready-to-use /tmp so run it in basic.target *after* sysinit.target
+/lib/systemd/system/debian-enable-units.service /lib/systemd/system/basic.target.wants/debian-enable-units.service
# Compat symlink
/lib/systemd/systemd /bin/systemd
diff --git a/debian/systemd.postrm b/debian/systemd.postrm
index d95feca..0ab4c9f 100644
--- a/debian/systemd.postrm
+++ b/debian/systemd.postrm
@@ -3,8 +3,8 @@
set -e
# Clean up the mess we created
-if [ "$1" = "purge" ]; then
- statedir=/var/lib/systemd
+statedir=/var/lib/systemd
+if [ "$1" = "purge" ] && [ -d $statedir ]; then
find $statedir -name "*.symlinks" | while read file ; do
while read symlink ; do
rm -f "$symlink"
diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 53d0f31..7b63752 100644
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -10,7 +10,7 @@ Description=Remount Root FS
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service
-Before=local-fs-pre.target local-fs.target shutdown.target mountoverflowtmp.service
+Before=local-fs-pre.target local-fs.target shutdown.target
Wants=local-fs-pre.target
[Service]
