summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-20 19:27:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-20 19:27:10 +0000
commita10bc69094bf47216b0621e154c4fd6a8ff61689 (patch)
treeae118e32e17e2ae95964ccdc17be246d57141e01 /perl-install/install_steps_interactive.pm
parentbdbc1b603d0a0cb61bfa3518858bbe333c1a2b16 (diff)
downloaddrakx-backup-do-not-use-a10bc69094bf47216b0621e154c4fd6a8ff61689.tar
drakx-backup-do-not-use-a10bc69094bf47216b0621e154c4fd6a8ff61689.tar.gz
drakx-backup-do-not-use-a10bc69094bf47216b0621e154c4fd6a8ff61689.tar.bz2
drakx-backup-do-not-use-a10bc69094bf47216b0621e154c4fd6a8ff61689.tar.xz
drakx-backup-do-not-use-a10bc69094bf47216b0621e154c4fd6a8ff61689.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 18b9e3059..26781f254 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -665,10 +665,11 @@ sub createBootdisk {
my ($o, $first_time) = @_;
my @l = detect_devices::floppies();
my %l = (
- 'fd0' => __("First drive"),
- 'fd1' => __("Second drive"),
+ 'fd0' => __("First floppy drive"),
+ 'fd1' => __("Second floppy drive"),
'Skip' => __("Skip"),
);
+ $l{$_} ||= $_ foreach @l;
if ($first_time || @l == 1) {
$o->ask_yesorno('',
@@ -682,7 +683,6 @@ failures. Would you like to create a bootdisk for your system?"),
$o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
} else {
@l or die _("Sorry, no floppy drive available");
- $l{$_} ||= $_ foreach @l;
$o->{mkbootdisk} = ${{reverse %l}}{$o->ask_from_list_('',
_("Choose the floppy drive you want to use to make the bootdisk"),
@@ -690,7 +690,8 @@ failures. Would you like to create a bootdisk for your system?"),
return $o->{mkbootdisk} = '' if $o->{mkbootdisk} eq 'Skip';
}
- $o->ask_warn('', _("Insert a floppy in drive %s", $o->{mkbootdisk}));
+ log::l(">>>> mkbootdisk $o->{mkbootdisk}, $l{$o->{mkbootdisk}}");
+ $o->ask_warn('', _("Insert a floppy in drive %s", $l{$o->{mkbootdisk}}));
my $w = $o->wait_message('', _("Creating bootdisk"));
install_steps::createBootdisk($o);
}
@@ -1148,6 +1149,7 @@ sub load_thiskind {
#- hey, we're allowed to pci probe :) let's do a lot of probing!
install_any::ultra66($o);
+ require pci_probing::main;
if (my ($c) = pci_probing::main::probe('AUDIO')) {
modules::add_alias("sound", $c->[1]) if pci_probing::main::check($c->[1]);
}