From 17f770f1e961fc4f9b2f21f2ec608c023ad1e218 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Thu, 11 Sep 2003 12:41:16 +0000 Subject: protected restore entry to be only visible if restore option added during boot. --- perl-install/bootloader.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install') 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; -- cgit v1.2.1