diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-08-28 20:22:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-08-28 20:22:16 +0000 |
| commit | b48994c225138c5a1834877f60be771363e63816 (patch) | |
| tree | 9ca56c3c2a56a76918d7e2059f1258ea727cb42f /perl-install/install_steps.pm | |
| parent | 7a9d795053d1bab93c5cca346234d47d1b2b6932 (diff) | |
| download | drakx-b48994c225138c5a1834877f60be771363e63816.tar drakx-b48994c225138c5a1834877f60be771363e63816.tar.gz drakx-b48994c225138c5a1834877f60be771363e63816.tar.bz2 drakx-b48994c225138c5a1834877f60be771363e63816.tar.xz drakx-b48994c225138c5a1834877f60be771363e63816.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 15 |
1 files changed, 5 insertions, 10 deletions
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($) { |