From b48994c225138c5a1834877f60be771363e63816 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 28 Aug 1999 20:22:16 +0000
Subject: no_comment

---
 perl-install/install_steps.pm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 38523e20f..033d92f8e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -6,6 +6,7 @@ use strict;
 use common qw(:file :system :common);
 use install_any qw(:all);
 use partition_table qw(:types);
+use detect_devices;
 use modules;
 use run_program;
 use lilo;
@@ -225,19 +226,13 @@ sub createBootdisk($) {
 
     my @l = detect_devices::floppies();
 
-    $dev = shift @l if $dev eq "1"; # special case to specify autochoose
+    $dev = shift @l || die _("no floppy available") 
+      if $dev eq "1"; # special case meaning autochoose
 
     return if $::testing;
 
-	
-	unshift @l, $
-
-	$o->{mkbootdisk} = shift @l || die _("no floppy available") if $o->{mkbootdisk} eq "1";
-       
-	    eval { 
-		lilo::mkbootdisk($o->{prefix}, versionString(), "/dev/" . $o->{mkbootdisk}) 
-	      };
-	    $o->{mkbootdisk} = 1;
+    lilo::mkbootdisk($o->{prefix}, versionString(), "/dev/$dev");
+    $o->{mkbootdisk} = $dev;
 }
 
 sub setupBootloader($) {
-- 
cgit v1.2.1