summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/ui.pmbin9851 -> 9916 bytes
-rw-r--r--perl-install/modparm.pm33
-rw-r--r--perl-install/modules.pm2
3 files changed, 10 insertions, 25 deletions
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index 9e9a9104f..2ccc1b5e3 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
Binary files differ
diff --git a/perl-install/modparm.pm b/perl-install/modparm.pm
index 2defe4221..1e9524572 100644
--- a/perl-install/modparm.pm
+++ b/perl-install/modparm.pm
@@ -9,19 +9,8 @@ use strict;
use common;
use modules;
-sub parameter_type {
- my ($min, $max, $is_a_number) = @_;
- $min == 1 && $max == 1 ?
- ($is_a_number ? _("a number") : '') :
- $min == $max ?
- ($is_a_number ? _("%d comma separated numbers", $min) : _("%d comma separated strings", $min)) :
- $min == 1 ?
- ($is_a_number ? _("comma separated numbers") : _("comma separated strings")) :
- ''; #- to weird and buggy, do not display it
-}
-
-sub raw_parameters {
+sub parameters {
my ($module) = @_;
my $modinfo = '/sbin/modinfo';
@@ -57,18 +46,14 @@ sub raw_parameters {
}
#- print "STILL HAVE ($_)\n" if $_;
- push @parameters, [ $name, $description, $min, $max, $is_a_number ];
- }
- @parameters;
-}
-
-sub parameters {
- my ($module) = @_;
- my @parameters ;
- foreach (raw_parameters($module)) {
- my ($name, $description, $min, $max, $is_a_number) = @$_;
- my $format = parameter_type($min, $max, $is_a_number);
- push @parameters, [ $format ? "$name ($format)" : $name, $description ];
+ my $format = $min == 1 && $max == 1 ?
+ ($is_a_number ? _("a number") : '') :
+ $min == $max ?
+ ($is_a_number ? _("%d comma separated numbers", $min) : _("%d comma separated strings", $min)) :
+ $min == 1 ?
+ ($is_a_number ? _("comma separated numbers") : _("comma separated strings")) :
+ ''; #- to weird and buggy, do not display it
+ push @parameters, [ $format ? "$name ($format)" : $name, $description, $min, $max, $is_a_number ];
}
@parameters;
}
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 33672bb10..b72de2053 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -8,7 +8,7 @@ use run_program;
use log;
use list_modules;
-my %conf;
+our %conf;
sub category2modules_and_description {
my ($categories) = @_;