diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-09-11 12:41:16 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-09-11 12:41:16 +0000 |
| commit | 17f770f1e961fc4f9b2f21f2ec608c023ad1e218 (patch) | |
| tree | dafafdbfa41e09096db79a8b302673193e46c411 | |
| parent | 4dc0def673bf87bfe60e83cb7ec2a4bbb9086297 (diff) | |
| download | drakx-17f770f1e961fc4f9b2f21f2ec608c023ad1e218.tar drakx-17f770f1e961fc4f9b2f21f2ec608c023ad1e218.tar.gz drakx-17f770f1e961fc4f9b2f21f2ec608c023ad1e218.tar.bz2 drakx-17f770f1e961fc4f9b2f21f2ec608c023ad1e218.tar.xz drakx-17f770f1e961fc4f9b2f21f2ec608c023ad1e218.zip | |
protected restore entry to be only visible if restore option added during boot.
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index d49307948..c8fb56b8f 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -546,7 +546,7 @@ 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" && + if ($::restore && -e "/tmp/image/boot/vmlinuz" && -e "/tmp/image/boot/all.rdz" && ($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; |