summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-13 10:32:30 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-13 10:32:30 +0000
commitcc652e366ff806b470d26d4867d8b6f0ace72cba (patch)
tree841836cc32c44ca2de187a3d0c4cbe377522dad3
parenta60f538b93aa1b5915a8db6d429f43a43480c3b8 (diff)
downloaddrakx-cc652e366ff806b470d26d4867d8b6f0ace72cba.tar
drakx-cc652e366ff806b470d26d4867d8b6f0ace72cba.tar.gz
drakx-cc652e366ff806b470d26d4867d8b6f0ace72cba.tar.bz2
drakx-cc652e366ff806b470d26d4867d8b6f0ace72cba.tar.xz
drakx-cc652e366ff806b470d26d4867d8b6f0ace72cba.zip
(has_systemd) fix checking systemd presence after systemd merge of subpackages
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/services.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 7ce19b104..456906d53 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- services:
+ o fix checking systemd presence after systemd merge of subpackages
+
Version 14.32 - 28 July 2012
- package group selection:
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 0b1359af2..51bf21792 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -355,7 +355,7 @@ sub running_systemd() {
}
sub has_systemd() {
- run_program::rooted($::prefix, '/bin/rpm', '-q', 'systemd-sysvinit');
+ run_program::rooted($::prefix, '/bin/rpm', '-q', 'systemd');
}
sub xinetd_services() {