summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-11 04:41:05 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-02-10 23:18:26 +0100
commit205198fbd2e4802d9faf079e46d132aee63d0380 (patch)
tree9f957598fc68140dc3d8d13b252f22f57902f5c9 /perl-install
parent7ed7e35e9aa89a7e91b743d632f020f95eaeff58 (diff)
downloaddrakx-205198fbd2e4802d9faf079e46d132aee63d0380.tar
drakx-205198fbd2e4802d9faf079e46d132aee63d0380.tar.gz
drakx-205198fbd2e4802d9faf079e46d132aee63d0380.tar.bz2
drakx-205198fbd2e4802d9faf079e46d132aee63d0380.tar.xz
drakx-205198fbd2e4802d9faf079e46d132aee63d0380.zip
add support for grub2-text too (mga#9431)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm10
-rw-r--r--perl-install/install/NEWS2
3 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4f3c28ff3..42e02108e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakboot:
+ o add support for grub2-text too (mga#9431)
- library (for draklive-install):
o check ESP has the right fs type (mga#16246)
o check that ESP mount point actually is an ESP
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 096615eaf..9fd714929 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -324,7 +324,7 @@ sub read_grub2() {
$bootloader{default} = $1 if /saved_entry=(.*)/;
}
- $bootloader{method} = 'grub2';
+ $bootloader{method} = cat_($f) =~ /set theme=.*maggy/ ? 'grub2-graphic' : 'grub2';
\%bootloader;
}
@@ -1277,7 +1277,8 @@ sub method2text {
my ($method) = @_;
+{
'lilo-menu' => N("LILO with text menu"),
- 'grub2' => N("GRUB2 with graphical menu"),
+ 'grub2-graphic' => N("GRUB2 with graphical menu"),
+ 'grub2' => N("GRUB2 with text menu"),
'grub-graphic' => N("GRUB with graphical menu"),
'grub-menu' => N("GRUB with text menu"),
}->{$method};
@@ -1289,7 +1290,7 @@ sub method_choices_raw {
arch() =~ /mips/ ? 'pmon2000' :
arch() =~ /arm/ ? 'uboot' :
if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix),
- 'grub2'),
+ 'grub2-graphic', 'grub2'),
if_(!is_uefi(), (
if_(!$b_prefix_mounted || whereis_binary('grub', $::prefix),
'grub-graphic', 'grub-menu'),
@@ -1307,7 +1308,7 @@ sub method_choices {
grep {
!(/lilo/ && (isLoopback($root_part) || $have_dmraid))
&& (/grub2/ || $boot_part->{fs_type} ne 'btrfs')
- && !(/grub-graphic/ && cat_("/proc/cmdline") =~ /console=ttyS/);
+ && !(/grub2?-graphic/ && cat_("/proc/cmdline") =~ /console=ttyS/);
} method_choices_raw($b_prefix_mounted);
}
sub main_method_choices {
@@ -2136,6 +2137,7 @@ sub ensure_pkg_is_installed {
my %suppl = (
# method => [ 'pkg_name', 'file_to_test' ],
'grub-graphic' => [ qw(mageia-gfxboot-theme /usr/share/gfxboot/themes/Mageia/boot/message) ],
+ 'grub2-graphic' => [ qw(grub2-mageia-theme /boot/grub2/themes/maggy/theme.txt) ],
);
my $main_method = main_method($bootloader->{method});
if (member($main_method, qw(grub grub2 lilo))) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ce842148e..6a19e9e88 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader:
+ o add support for grub2-text too (mga#9431)
- partionning:
o check ESP has the right fs type (mga#16246)
o check that ESP mount point actually is an ESP