[Pkg-sysvinit-devel] Bug#703595: sysvinit: Fix check for systemd

[Martin Pitt]

Package: sysvinit
Version: 2.88dsf-42
Tags: patch
User: pkg-utopia-maintainers at lists.alioth.debian.org
Usertags: logind

Hello,

in Debian we soon plan to make it possible to run systemd's logind
without the systemd init bits. For this, sysvinit's postinst needs a
more precise check whether systemd init is running. Please see this
for details:

  https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00092.html

Thanks for considering,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru sysvinit-2.88dsf/debian/changelog sysvinit-2.88dsf/debian/changelog
--- sysvinit-2.88dsf/debian/changelog	2013-02-08 00:33:50.000000000 +0100
+++ sysvinit-2.88dsf/debian/changelog	2013-03-21 10:13:58.000000000 +0100
@@ -1,3 +1,10 @@
+sysvinit (2.88dsf-42) UNRELEASED; urgency=low
+
+  * debian/postinst: Check whether systemd init is running, not just for the
+    cgroup (which is also being used by logind).
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 21 Mar 2013 10:12:16 +0100
+
 sysvinit (2.88dsf-41) unstable; urgency=low
 
   [ Roger Leigh ]:
diff -Nru sysvinit-2.88dsf/debian/postinst sysvinit-2.88dsf/debian/postinst
--- sysvinit-2.88dsf/debian/postinst	2013-02-08 00:31:58.000000000 +0100
+++ sysvinit-2.88dsf/debian/postinst	2013-03-21 10:12:08.000000000 +0100
@@ -96,7 +96,7 @@
 
 # If systemd is running, don't restart init or doing any initctl
 # migration.
-if [ -e /sys/fs/cgroup/systemd ]; then
+if [ -e /run/systemd/system ]; then
 	restart=no
 fi
 if [ "$(uname -s)" = "GNU" ]; then
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-sysvinit-devel/attachments/20130321/3eb34f9b/attachment.pgp>