PolicyKit: Branch 'master' - 2 commits

[GitLab Mirror]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23fd211e7cdabc9d478c455b6c1fd0c69673976b
Merge: eac6fa7 89c4dac
Author: Ray Strode <halfline at gmail.com>
Date:   Mon Dec 3 22:50:58 2018 +0000

    Merge branch 'systemd-cgroupsv2' into 'master'
    
    configure.ac: fix detection of systemd with cgroups v2
    
    See merge request polkit/polkit!13

commit 89c4dac320b1f13386dfb1f4ad0a3e308a8a6372
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sun Dec 2 23:40:53 2018 +0100

    configure.ac: fix detection of systemd with cgroups v2
    
    sys/fs/cgroup/systemd/ does not exist on modern systems.

diff --git a/configure.ac b/configure.ac
index bfa87dd..5c37e48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,7 +201,7 @@ fi
 
 AS_IF([test "x$cross_compiling" != "xyes" ], [
   AS_IF([test "$have_libsystemd" = "yes"], [
-    AS_IF([test ! -d /sys/fs/cgroup/systemd/ ], [
+    AS_IF([test ! -d /sys/fs/cgroup/systemd/ -a ! -d /sys/fs/cgroup/init.scope ], [
       AS_IF([test "$enable_libsystemd_login" = "yes"], [
         AC_MSG_WARN([libsystemd requested but system does not appear to be using systemd])
       ], [