X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=1c5e25f48b1526209137351e181bb2040c494499;hb=a56317566353ab14adc5f68da93af51d880b6ffd;hp=d410162462428cf398a9078c0f8c99819a266475;hpb=6156b4779584b4bf1dc973ce988a34a1bcae1db3;p=elogind.git

diff --git a/configure.ac b/configure.ac
index d41016246..1c5e25f48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,10 +113,17 @@ fi
 # ------------------------------------------------------------------------------
 # Find running cgroup controller
 with_cgroupctrl=
-AS_IF(  [test -f /proc/self/cgroup],
-        [with_cgroupctrl=`grep "^1:name=" /proc/self/cgroup | cut -d ':' -f 2`])
+AS_IF(  [test -f /proc/self/cgroup], [
+        # If the init system is a cgroup controler, it will be position 1.
+        # Secondary controllers, like cgmanager, do not work.
+        with_cgroupctrl=`grep "^1:name=" /proc/self/cgroup | cut -d ':' -f 2`
+        AS_IF(  [test -z "$with_cgroupctrl"], [
+                # Try to be our own cgroup controller
+                with_cgroupctrl="name=elogind"
+        ])
+])
 AS_IF(  [test -z "$with_cgroupctrl"],
-        [with_cgroupctrl="name=elogind"])
+        AC_MSG_ERROR([No running cgroup controller found]))
 
 
 # ------------------------------------------------------------------------------