From f70da6dee2087dbcb26e1ae6e00c5ea859c0c787 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Mon, 24 Jul 2017 23:07:38 +0100 Subject: Fix drakboot video mode selection when using grub2 (mga#21246) The video mode needs to be extracted from and written back to the GRUB_CMDLINE_LINUX_DEFAULT parameter in /etc/defaults/grub2. This fix creates a new "default_vga" key in the $bootloader hash to hold the current selection. Using the existing "vga" key would cause the default video mode to be added to any bootloader entries that don't have a specific "vga" value, e.g. the "failsafe" entry. The $bootloader "vga" value doesn't appear to be set anywhere else, so may in fact be obsolete. --- perl-install/any.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/any.pm') diff --git a/perl-install/any.pm b/perl-install/any.pm index 376240aac..a82fce94a 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -632,7 +632,7 @@ sub setupBootloader__grub2 { require Xconfig::resolution_and_depth; require network::network; #- to list network profiles - my $vga = Xconfig::resolution_and_depth::from_bios($b->{vga}); + my $vga = Xconfig::resolution_and_depth::from_bios($b->{default_vga}); my $os_prober = $in->do_pkgs->is_installed('os-prober', '/usr/bin/os-prober'); my $res = $in->ask_from_( @@ -660,7 +660,7 @@ sub setupBootloader__grub2 { if ($res) { $b->{entries} = $b2->{entries}; $b->{default} = $default; - $b->{vga} = ref($vga) ? $vga->{bios} : $vga; + $b->{default_vga} = ref($vga) ? $vga->{bios} : $vga; $b->{perImageAppend} = $append; if ($os_prober) { $in->do_pkgs->ensure_is_installed('os-prober', '/usr/bin/os-prober'); -- cgit v1.2.1