diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-03 09:54:05 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-03 09:54:05 +0000 |
commit | 398eb0953c8d865ea1c76ce76aa26eb1fe4d3a4e (patch) | |
tree | 39b997e34a55d8218030ba3b5bf640246afd3d69 /perl-install/install_steps.pm | |
parent | 7e97be4647322b29d7218bac9b078a0d6b294afd (diff) | |
download | drakx-398eb0953c8d865ea1c76ce76aa26eb1fe4d3a4e.tar drakx-398eb0953c8d865ea1c76ce76aa26eb1fe4d3a4e.tar.gz drakx-398eb0953c8d865ea1c76ce76aa26eb1fe4d3a4e.tar.bz2 drakx-398eb0953c8d865ea1c76ce76aa26eb1fe4d3a4e.tar.xz drakx-398eb0953c8d865ea1c76ce76aa26eb1fe4d3a4e.zip |
blank.img has been removed, so remove special code handling it
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r-- | perl-install/install_steps.pm | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 70cec9202..24f498b27 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -528,30 +528,12 @@ GridHeight=70 #- call update-menus at the end of package installation push @{$o->{waitpids}}, run_program::raw({ root => $o->{prefix}, detach => 1 }, "update-menus", "-n"); - if ($o->{blank} || $o->{updatemodules}) { - my @l = detect_devices::floppies_dev(); - - foreach (qw(blank updatemodules)) { - $o->{$_} eq "1" and $o->{$_} = $l[0] || die N("No floppy drive available"); - } - - $o->{blank} and $o->copyKernelFromFloppy; - $o->{updatemodules} and $o->updateModulesFromFloppy; + if ($o->{updatemodules}) { + $o->{updatemodules} = detect_devices::floppy() or die N("No floppy drive available"); + $o->updateModulesFromFloppy; } } -sub copyKernelFromFloppy { - my ($o) = @_; - return if $::testing || !$o->{blank}; - - fs::mount($o->{blank}, "/floppy", "vfat", 0); - eval { cp_af("/floppy/vmlinuz", "$o->{prefix}/boot/vmlinuz-default") }; - if ($@) { - log::l("copying of /floppy/vmlinuz from blank modified disk failed: $@"); - } - fs::umount("/floppy"); -} - sub install_urpmi { my ($o) = @_; |