Commit 445f8dfd authored by Michael Biebl's avatar Michael Biebl
Browse files

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.
parent 7741086a
......@@ -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 <biebl@debian.org> Thu, 20 Jun 2013 00:54:30 +0200
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment