diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-09-10 13:24:46 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-09-10 13:24:46 +0000 |
| commit | e3765744e9bdb24ad1218f0e5eebef9814353d9b (patch) | |
| tree | 48343e6f35625efc0575a3a73d2f28947129ea87 | |
| parent | b8286e722b4bbb7867dd2a4fc61c16a3949afa14 (diff) | |
| download | drakx-e3765744e9bdb24ad1218f0e5eebef9814353d9b.tar drakx-e3765744e9bdb24ad1218f0e5eebef9814353d9b.tar.gz drakx-e3765744e9bdb24ad1218f0e5eebef9814353d9b.tar.bz2 drakx-e3765744e9bdb24ad1218f0e5eebef9814353d9b.tar.xz drakx-e3765744e9bdb24ad1218f0e5eebef9814353d9b.zip | |
restore entry shouldn't have reference of vga=... in append, moved to vga.
| -rw-r--r-- | perl-install/bootloader.pm | 6 |
1 files changed, 5 insertions, 1 deletions
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 { |