diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-29 17:53:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-29 17:53:54 +0000 |
| commit | 38f7f8427f6300ccacb464a9d3b95e89d6f83ffc (patch) | |
| tree | 4bb5bf77bbe6128d4b458b30a277d655e6bf2e2b /perl-install/bootloader.pm | |
| parent | 42a8773fe0e728410692098f2a11652ef5752849 (diff) | |
| download | drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.gz drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.bz2 drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.xz drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.zip | |
- drop oem & recovery code (which was broken)
- will be replaced with a root password + user accounts + network configuration a la drakfirsttime
Diffstat (limited to 'perl-install/bootloader.pm')
| -rw-r--r-- | perl-install/bootloader.pm | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 29bf33959..2010c625e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -746,33 +746,6 @@ wait for default boot. any::set_login_serial_console($port, $speed); } - #- 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 ($::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; - 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"); - cp_af("/tmp/image/boot/all.rdz", "$::prefix/boot/restore/all.rdz") }; - unless ($@) { - log::l("adding a restore bootloader entry on $hd_install_path (remapped to $::prefix/boot/restore)"); - add_entry($bootloader, { - type => 'image', - label => 'restore', - kernel_or_dev => "/boot/restore/vmlinuz", - initrd => "/boot/restore/all.rdz", - append => "$cmdline recovery", #- the restore entry is a recovery entry - if_($vga, vga => $vga), - }); - } - } else { - log::l("no restore bootloader need to be used on $hd_install_path"); - } - } - my @kernels = get_kernels_and_labels() or die "no kernel installed"; foreach my $kernel (@kernels) { |