diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-11-03 17:44:45 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-11-03 17:44:45 +0000 |
| commit | 10db32ea8e6b3502ab248c037339a230e297a7f2 (patch) | |
| tree | b39db4e0a2c2218bab927e31146d74b804b8a2df | |
| parent | ee6a7476c40666c89b7d70a5d12d9626b92089a5 (diff) | |
| download | drakx-10db32ea8e6b3502ab248c037339a230e297a7f2.tar drakx-10db32ea8e6b3502ab248c037339a230e297a7f2.tar.gz drakx-10db32ea8e6b3502ab248c037339a230e297a7f2.tar.bz2 drakx-10db32ea8e6b3502ab248c037339a230e297a7f2.tar.xz drakx-10db32ea8e6b3502ab248c037339a230e297a7f2.zip | |
adapt to new reboot path
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f1fb134b1..d6847717a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- adapt to new reboot path - include FIRMWARE packages from Cards+ in detected graphical drivers, not to remove radeon-firmware if a matching card is present (#6438, #7641) diff --git a/perl-install/any.pm b/perl-install/any.pm index 401464579..c291bdae5 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1117,7 +1117,7 @@ sub reboot() { $o->exit; } else { # when refusing license in finish-install: - exec("/sbin/reboot"); + exec("/bin/reboot"); } } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 7db525413..e86054c25 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- adapt to new reboot path + Version 14.49 - 3 November 2012 - Mageia 3 alpha 3 banner diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 7c8be09fd..86037034a 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -458,7 +458,7 @@ if ($reboot_needed && ! -e "/tmp/.X11-unix/X0") { ($reply, $timedout) = dialog_with_timeout("okcancel", N("Display driver setup"), N("The system has to be rebooted due to a display driver change.") . "\n\n" . N("Press Cancel within %d seconds to abort.", 30), 30, $plymouth); if ($reply || $timedout) { - exec("/sbin/reboot"); + exec("/bin/reboot"); } } |