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

---
 make_boot_img                             |  2 +-
 perl-install/install2.pm                  |  3 +--
 perl-install/install_steps.pm             | 24 +++---------------------
 perl-install/install_steps_interactive.pm |  6 ------
 perl-install/modules.pm                   |  2 +-
 5 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/make_boot_img b/make_boot_img
index af4d65fb4..e5a06f076 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -112,7 +112,7 @@ sub initrd {
 	install_stripped("$instdir/$install", "$mnt/sbin/stage1");
     }
 
-    if (member($type, qw(network network_gigabit_usb all blank))) {
+    if (member($type, qw(network network_gigabit_usb all))) {
 	install_stripped("$instdir/ppp/pppd-bin", "$mnt/sbin/pppd");
 	install_stripped("$instdir/rp-pppoe/pppoe-bin", "$mnt/sbin/pppoe");
 	_ "$sudo mknod $mnt/dev/ppp c 108 0";
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 1850cd5d9..8e654cb76 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -114,7 +114,7 @@ sub selectMouse {
 sub setupSCSI {
     my ($clicked, $_ent_number, $auto) = @_;
 
-    if (!$o->{blank} && !$::testing && !$::uml_install) {
+    if (!$::testing && !$::uml_install) {
 	-d '/lib/modules/' . c::kernel_version() ||
 	  -s modules::cz_file() or die N("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file());
     }
@@ -409,7 +409,6 @@ sub main {
 	    alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
 	    fdisk => sub { $o->{partitioning}{fdisk} = 1 },
 	    nomouseprobe => sub { $o->{nomouseprobe} = $v },
-	    blank         => sub { $o->{blank} = $::blank = 1 },
 	    updatemodules => sub { $o->{updatemodules} = 1 },
 	    move  => sub { $::move = 1 },
 	}}{lc $n}; &$f if $f;
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) = @_;
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 5db3b673c..960681702 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -722,12 +722,6 @@ sub afterInstallPackages($) {
     $o->SUPER::afterInstallPackages;
 }
 
-sub copyKernelFromFloppy {
-    my ($o) = @_;
-    $o->ask_okcancel('', N("Please insert the Boot floppy used in drive %s", $o->{blank}), 1) or return;
-    $o->SUPER::copyKernelFromFloppy;
-}
-
 sub updateModulesFromFloppy {
     my ($o) = @_;
     $o->ask_okcancel('', N("Please insert the Update Modules floppy in drive %s", $o->{updatemodules}), 1) or return;
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 8686eaa9c..638bebd5b 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -77,7 +77,7 @@ sub load {
     };
     my @network_devices = $network_module ? detect_devices::getNet() : ();
 
-    if ($::testing || $::blank) {
+    if ($::testing) {
 	log::l("i would load module $_ (" . join(" ", @{$options{$_}}) . ")") foreach @l;
     } elsif ($::isStandalone || $::move) {
 	run_program::run('/sbin/modprobe', $_, @{$options{$_}}) 
-- 
cgit v1.2.1