From a7fffb36b7e374e33192a1f6b650f7451a713a54 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 21 Mar 2020 12:07:42 +0000 Subject: Fix services::running_systemd(). systemd has migrated to cgroups v2, so the old test no longer works. Instead, test for the existence of /run/systemd/system as described in https://www.freedesktop.org/software/systemd/man/sd_booted.html. --- perl-install/NEWS | 1 + perl-install/services.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 3bcfe329d..37d065d9b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- fix services::running_systemd() - service_harddrake: recognise noxconf boot command line option (disables creation of xorg.conf, allowing X server to configure itself) - cache results from detect_devices::getInputDevices() diff --git a/perl-install/services.pm b/perl-install/services.pm index f76b29b86..29593c9b2 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -342,7 +342,7 @@ sub doit { } sub running_systemd() { - run_program::rooted($::prefix, '/bin/mountpoint', '-q', '/sys/fs/cgroup/systemd'); + -d '/run/systemd/system'; } sub has_systemd() { -- cgit v1.2.1