From 445f8dfd5bae908c4f3a0527a2df76f89239084a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 20 Jun 2013 01:07:27 +0200 Subject: [PATCH] If the new init-system-helpers package is installed, make the debian-enable-units script a no-op. The auto-enabler was meant as a temporary workaround and will be removed once all packages use the new helper. --- debian/changelog | 4 ++++ debian/debian-enable-units | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index defeb05f2..8f407dcfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ systemd (44-12) UNRELEASED; urgency=low * Cherry-pick e17187 from upstream to fix build failures with newer glibc where the clock_* symbols have been moved from librt to libc. Closes: #701364 + * If the new init-system-helpers package is installed, make the + debian-enable-units script a no-op. The auto-enabler was meant as a + temporary workaround and will be removed once all packages use the new + helper. -- Michael Biebl Thu, 20 Jun 2013 00:54:30 +0200 diff --git a/debian/debian-enable-units b/debian/debian-enable-units index d231d756b..cc487954a 100755 --- a/debian/debian-enable-units +++ b/debian/debian-enable-units @@ -5,6 +5,12 @@ enabled_units=/var/lib/systemd/enabled-units statedir=/var/lib/systemd unitdir=/lib/systemd/system +# If a package is installed using init-system-helpers, do nothing. +# We don't want to interfere in such a case +if [ -x /usr/bin/deb-systemd-helper ] ; then + exit 0 +fi + # If systemd is not running, schedule a run on next boot if ! [ -e /sys/fs/cgroup/systemd ] ; then touch $statedir/run-debian-enable-units