summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-07 16:04:35 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-07 16:04:35 +0000
commitb8f3f1d37183e4ba45a173f1c9800e56daa1fa3a (patch)
tree040821895050aa4365c9e9e72a142dcc5fa3de87 /perl-install/install_steps_interactive.pm
parent5d31c65a29a5be64fe46946651108e0e13242037 (diff)
downloaddrakx-backup-do-not-use-b8f3f1d37183e4ba45a173f1c9800e56daa1fa3a.tar
drakx-backup-do-not-use-b8f3f1d37183e4ba45a173f1c9800e56daa1fa3a.tar.gz
drakx-backup-do-not-use-b8f3f1d37183e4ba45a173f1c9800e56daa1fa3a.tar.bz2
drakx-backup-do-not-use-b8f3f1d37183e4ba45a173f1c9800e56daa1fa3a.tar.xz
drakx-backup-do-not-use-b8f3f1d37183e4ba45a173f1c9800e56daa1fa3a.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm42
1 files changed, 17 insertions, 25 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f09040eda..9a98e16bb 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -534,38 +534,30 @@ sub loadModule {
[ modules::text_of_type($type) ]) or return;
my $m = modules::text2driver($l);
- if ($o->ask_from_list('',
+ my @names = modparm::get_options_name($m);
+
+ if ((!defined @names || @names > 0) && $o->ask_from_list('',
_("In some cases, the %s driver needs to have extra information to work
properly, although it normally works fine without. Would you like to specify
extra options for it or allow the driver to probe your machine for the
information it needs? Occasionally, probing will hang a computer, but it should
not cause any damage.", $l),
- [ __("Autoprobe"), __("Specify options") ], "Autoprobe") ne "Autoprobe") {
+ [ __("Autoprobe"), __("Specify options") ], "Autoprobe") ne "Autoprobe") {
ASK:
- my $rnames = modparm::get_options_name($m);
- my $rvalues = modparm::get_options_value($m);
-
- $o->ask_from_entries_ref('',
+ if (defined @names) {
+ my @l = $o->ask_from_entries('',
_("Here must give the different options for the module %s.", $l),
- $rnames, $rvalues);
-
- @options = split ' ', modparm::get_options_result($m, $rvalues);
-# @options = split ' ',
-# $o->ask_from_entry('',
-#_("Here must give the different options for the module %s.
-#Options are in format ``name=value name2=value2 ...''.
-#For example you can have ``io=0x300 irq=7''", $l),
-# _("Module options:"),
-# );
-#=======
-# ASK:
-# @options = split ' ',
-# $o->ask_from_entry('',
-#_("Here must give the different options for the module %s.
-#Options are in format ``name=value name2=value2 ...''.
-#For example you can have ``io=0x300 irq=7''", $l),
-# _("Module options:"),
-# );
+ \@names) or return;
+ @options = modparm::get_options_result($m, @l);
+ } else {
+ @options = split ' ',
+ $o->ask_from_entry('',
+_("Here must give the different options for the module %s.
+Options are in format ``name=value name2=value2 ...''.
+For example you can have ``io=0x300 irq=7''", $l),
+ _("Module options:"),
+ );
+ }
}
eval { modules::load($m, $type, @options) };
if ($@) {