diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-10-08 19:59:17 +0100 |
|---|---|---|
| committer | Pascal Terjan <pterjan@gmail.com> | 2014-10-20 21:29:56 +0000 |
| commit | 7943c27abdfbfa453100495882df15b23ec09c70 (patch) | |
| tree | 3098a534105a80e13914852319d710d4058ef131 | |
| parent | 65f2ca718868f996a860b4cd3b499b75003ae24e (diff) | |
| download | drakx-7943c27abdfbfa453100495882df15b23ec09c70.tar drakx-7943c27abdfbfa453100495882df15b23ec09c70.tar.gz drakx-7943c27abdfbfa453100495882df15b23ec09c70.tar.bz2 drakx-7943c27abdfbfa453100495882df15b23ec09c70.tar.xz drakx-7943c27abdfbfa453100495882df15b23ec09c70.zip | |
fix drakxservices not showing all services due to systemctl output change
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/services.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 142bda583..6400a6ef2 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- fix drakxservices not showing all services due to systemctl output change + Version 16.42 - 18 September 2014 - only allow GRUB2 when booting on btrfs diff --git a/perl-install/services.pm b/perl-install/services.pm index eb5d0a87e..e9080162a 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -359,7 +359,7 @@ sub _systemd_services() { my %loaded; # Running system using systemd log::explanations("Detected systemd running. Using systemctl introspection."); - foreach (run_program::rooted_get_stdout($::prefix, '/bin/systemctl', '--full', '--all', 'list-units')) { + foreach (run_program::rooted_get_stdout($::prefix, '/bin/systemctl', '--no-legend', '--no-pager', '--full', '--all', 'list-units')) { if (my ($name) = m!^(\S+)\.service\s+loaded!) { # We only look at non-template, non-linked service files in /lib # We also check for any non-masked sysvinit files as these are @@ -371,7 +371,7 @@ sub _systemd_services() { } } # list-units will not list disabled units that can be enabled - foreach (run_program::rooted_get_stdout($::prefix, '/bin/systemctl', '--full', 'list-unit-files')) { + foreach (run_program::rooted_get_stdout($::prefix, '/bin/systemctl', '--no-legend', '--no-pager', '--full', 'list-unit-files')) { if (my ($name) = m!^(\S+)\.service\s+disabled!) { # We only look at non-template, non-linked service files in /lib # We also check for any non-masked sysvinit files as these are |