From e3765744e9bdb24ad1218f0e5eebef9814353d9b Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 10 Sep 2003 13:24:46 +0000 Subject: restore entry shouldn't have reference of vga=... in append, moved to vga. --- perl-install/bootloader.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 7b9933273..b9d1ae8da 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -545,8 +545,11 @@ wait %d seconds for default boot. #- add a restore entry if installation is done from disk, in order to allow redoing it. if (my $hd_install_path = any::hdInstallPath()) { + my ($cmdline, $vga); if (-e "/tmp/image/boot/vmlinuz" && -e "/tmp/image/boot/all.rdz" && - (my ($cmdline) = cat_("/tmp/image/boot/grub/menu.lst") =~ m|kernel \S+/boot/vmlinuz (.*)$|m)) { + ($cmdline = cat_("/tmp/image/boot/grub/menu.lst") =~ m|kernel \S+/boot/vmlinuz (.*)$|m)) { + #- cmdline should'n have any reference to vga=... + $cmdline =~ s/vga=(\S+)//g and $vga = $1; log::l("copying kernel and stage1 install to $::prefix/boot/restore"); eval { mkdir "$::prefix/boot/restore"; cp_af("/tmp/image/boot/vmlinuz", "$::prefix/boot/restore/vmlinuz"); @@ -559,6 +562,7 @@ wait %d seconds for default boot. kernel_or_dev => "/boot/restore/vmlinuz", initrd => "/boot/restore/all.rdz", append => $cmdline, + if_($vga, vga => $vga), }); } } else { -- cgit v1.2.1