From 398eb0953c8d865ea1c76ce76aa26eb1fe4d3a4e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 3 May 2004 09:54:05 +0000
Subject: blank.img has been removed, so remove special code handling it

---
 perl-install/install_steps.pm | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'perl-install/install_steps.pm')

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) = @_;
 
-- 
cgit v1.2.1