summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-04-15 17:29:54 +0000
committerColin Guthrie <colin@mageia.org>2013-04-15 17:29:54 +0000
commit6845b8641dbfb9be667a80f74483fb738900e025 (patch)
treea497fdf506f31a06853d7cb859093c27602a8f91
parent30a1e20b0ac6034fe18aa3a26792cbf12267fd23 (diff)
downloaddrakx-backup-do-not-use-6845b8641dbfb9be667a80f74483fb738900e025.tar
drakx-backup-do-not-use-6845b8641dbfb9be667a80f74483fb738900e025.tar.gz
drakx-backup-do-not-use-6845b8641dbfb9be667a80f74483fb738900e025.tar.bz2
drakx-backup-do-not-use-6845b8641dbfb9be667a80f74483fb738900e025.tar.xz
drakx-backup-do-not-use-6845b8641dbfb9be667a80f74483fb738900e025.zip
drakups: do not rely on legacy initscript for install test (mga#9474)
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakups2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7e5e33cb1..05503b2cf 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakups:
+ o do not rely on legacy initscript for install test (mga#9474)
+
Version 15.37 - 9 April 2013
- library:
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index 4283e2e27..b5baee934 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -316,7 +316,7 @@ $in = 'interactive'->vnew;
$ugtk2::wm_icon = "drakups";
if (!$::testing) {
- $in->do_pkgs->ensure_is_installed('nut-server', '/etc/rc.d/init.d/upsd') or $in->exit(1);
+ $in->do_pkgs->ensure_is_installed('nut-server', '/usr/sbin/upsd') or $in->exit(1);
}
if (member('--wizard', @ARGV)) {