summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-27 06:39:58 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-27 06:39:58 +0000
commit5b76050f1adf01c29ad5b08cf959614cbf76ec92 (patch)
tree4f326331c2cdaaaadda450c0f0b80234f9ec051b /perl-install
parented8f00d30c4dc83d088f885f6b30784069defe5a (diff)
downloaddrakx-5b76050f1adf01c29ad5b08cf959614cbf76ec92.tar
drakx-5b76050f1adf01c29ad5b08cf959614cbf76ec92.tar.gz
drakx-5b76050f1adf01c29ad5b08cf959614cbf76ec92.tar.bz2
drakx-5b76050f1adf01c29ad5b08cf959614cbf76ec92.tar.xz
drakx-5b76050f1adf01c29ad5b08cf959614cbf76ec92.zip
(method_choices_raw) put grub2 before grub-legacy
thus fixing detecting grub2 if there's a remaining grub-legacy signature basically reverting commit r6650 from 2012-12-09: "(method_choices_raw) put grub-legacy before grub2"
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/install/NEWS2
3 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8faf2a43d..7f1d540cb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o fix detecting grub2 if there's a remaining grub-legacy signature
+
Version 15.21 - 26 February 2013
- bootloader-config:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6171a1618..d912a183f 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1205,10 +1205,10 @@ sub method_choices_raw {
arch() =~ /mips/ ? 'pmon2000' :
arch() =~ /arm/ ? 'uboot' :
(
- if_(!$b_prefix_mounted || whereis_binary('grub', $::prefix),
- 'grub-graphic', 'grub-menu'),
if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix),
'grub2'),
+ if_(!$b_prefix_mounted || whereis_binary('grub', $::prefix),
+ 'grub-graphic', 'grub-menu'),
if_(!$b_prefix_mounted || whereis_binary('lilo', $::prefix),
'lilo-menu'),
);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 60ed8a992..f2fdd7c8e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader:
+ o fix detecting grub2 if there's a remaining grub-legacy signature
- do not attempt to use gurpmi.addmedia or gurpmi if in text mode
Version 15.22 - 26 February 2013