diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-03-21 12:07:42 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-03-21 17:14:37 +0000 |
| commit | a7fffb36b7e374e33192a1f6b650f7451a713a54 (patch) | |
| tree | e201ebd4c19c5c570ab5a2f7c4708ee380212015 | |
| parent | bd93eb514e6e1f42b7e136ef8e8b277c3a9d89b0 (diff) | |
| download | drakx-a7fffb36b7e374e33192a1f6b650f7451a713a54.tar drakx-a7fffb36b7e374e33192a1f6b650f7451a713a54.tar.gz drakx-a7fffb36b7e374e33192a1f6b650f7451a713a54.tar.bz2 drakx-a7fffb36b7e374e33192a1f6b650f7451a713a54.tar.xz drakx-a7fffb36b7e374e33192a1f6b650f7451a713a54.zip | |
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.
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/services.pm | 2 |
2 files changed, 2 insertions, 1 deletions
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() { |