diff options
Diffstat (limited to 'perl-install/modules')
| -rw-r--r-- | perl-install/modules/any_conf.pm | 7 | ||||
| -rw-r--r-- | perl-install/modules/interactive.pm | 8 | ||||
| -rw-r--r-- | perl-install/modules/modprobe_conf.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules/modules_conf.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules/parameters.pm | 6 |
5 files changed, 9 insertions, 16 deletions
diff --git a/perl-install/modules/any_conf.pm b/perl-install/modules/any_conf.pm index 3873955b3..e5388bca5 100644 --- a/perl-install/modules/any_conf.pm +++ b/perl-install/modules/any_conf.pm @@ -1,4 +1,4 @@ -package modules::any_conf; # $Id: any_conf.pm 215411 2007-04-25 12:26:16Z pixel $ +package modules::any_conf; use log; use common; @@ -139,10 +139,7 @@ sub write { #- Substitute new config (if config has changed) substInFile { my ($type, $module, $val) = split(' ', chomp_($_), 3); - if ($type eq 'post-install' && $module eq 'supermount') { - #- remove the post-install supermount stuff. - $_ = ''; - } elsif (member($type, $conf->handled_fields)) { + if (member($type, $conf->handled_fields)) { my $new_val = $conf->{$module}{$type}; if (!$new_val) { $_ = ''; diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm index abb1e9a82..dae135889 100644 --- a/perl-install/modules/interactive.pm +++ b/perl-install/modules/interactive.pm @@ -1,4 +1,4 @@ -package modules::interactive; # $Id: interactive.pm 253241 2009-02-25 09:28:44Z tv $ +package modules::interactive; use modules; use common; @@ -81,9 +81,9 @@ sub load_category__prompt_for_more { my %category2text = ( 'bus/usb' => N_("Installing driver for USB controller"), - 'bus/firewire' => N_("Installing driver for firewire controller %s"), - 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire|virtual' => N_("Installing driver for hard disk drive controller %s"), - list_modules::ethernet_categories() => N_("Installing driver for ethernet controller %s"), + 'bus/firewire' => N_("Installing driver for firewire controller \"%s\""), + 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire|virtual' => N_("Installing driver for hard disk drive controller \"%s\""), + list_modules::ethernet_categories() => N_("Installing driver for ethernet controller \"%s\""), ); sub wait_load_module { diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm index c9ad3ff5c..7989096f8 100644 --- a/perl-install/modules/modprobe_conf.pm +++ b/perl-install/modules/modprobe_conf.pm @@ -1,4 +1,4 @@ -package modules::modprobe_conf; # $Id: modprobe_conf.pm 259199 2009-08-13 10:18:59Z pterjan $ +package modules::modprobe_conf; use log; use common; diff --git a/perl-install/modules/modules_conf.pm b/perl-install/modules/modules_conf.pm index 5a6242ff5..be4b8fca4 100644 --- a/perl-install/modules/modules_conf.pm +++ b/perl-install/modules/modules_conf.pm @@ -1,4 +1,4 @@ -package modules::modules_conf; # $Id: modules_conf.pm 228209 2007-09-16 23:09:00Z blino $ +package modules::modules_conf; use log; use common; diff --git a/perl-install/modules/parameters.pm b/perl-install/modules/parameters.pm index 2a6d9df8f..36990b5d1 100644 --- a/perl-install/modules/parameters.pm +++ b/perl-install/modules/parameters.pm @@ -1,4 +1,4 @@ -package modules::parameters; # $Id: parameters.pm 215411 2007-04-25 12:26:16Z pixel $ +package modules::parameters; use diagnostics; use strict; @@ -13,10 +13,6 @@ use modules; sub parameters { my ($module) = @_; - if (!$::isStandalone && !$::testing) { - ($module) = modules::extract_modules('/tmp', $module); - } - map { chomp; (my $name, $_) = /(\w+):(.*)/s or warn "modules::parameters::parameters($module): unknown line\n"; |