diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-10 09:15:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-10 09:15:24 +0000 |
| commit | fd82c0312a315599fb0d766fa5c6b7be4b211ba3 (patch) | |
| tree | d7a1e782db5b8b42cd9d4f5795d3da0b92871773 /perl-install/install_steps_interactive.pm | |
| parent | 1cfe6c79ba71ee10522049af62e959b79cd7c9ed (diff) | |
| download | drakx-backup-do-not-use-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar drakx-backup-do-not-use-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar.gz drakx-backup-do-not-use-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar.bz2 drakx-backup-do-not-use-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar.xz drakx-backup-do-not-use-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 70090a875..296441bb9 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -13,6 +13,7 @@ use vars qw(@ISA); use common qw(:common); use partition_table qw(:types); use install_steps; +use pci_probing::main; use install_any; use detect_devices; use timezone; @@ -591,15 +592,22 @@ sub setup_thiskind { my @l = $o->load_thiskind($type); return if $auto && (@l || !$at_least_one); while (1) { - @l ? - $o->ask_yesorno('', - [ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type), - _("Do you have another one?") ], "No") : - $o->ask_yesorno('', _("Do you have an %s interface?", $type), "No") or return; + my $msg = @l ? + [ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type), + _("Do you have another one?") ] : + _("Do you have an %s interface?", $type); - my @r = $o->loadModule($type) or return; - push @l, \@r; - } + my $opt = [ __("Yes"), __("No") ]; + push @$opt, __("See hardware info") if $::expert; + my $r = $o->ask_from_list_('', $msg, $opt); + $r eq "No" and return; + if ($r eq "Yes") { + my @r = $o->loadModule($type) or return; + push @l, \@r; + } else { + $o->ask_warn('', [ pci_probing::main::list() ]); + } + } } |