5 files changed, 16 insertions, 25 deletions

diff --git a/perl-install/modules/any_conf.pm b/perl-install/modules/any_conf.pm
index 855678dfd..c235e84f4 100644
--- a/perl-install/modules/any_conf.pm
+++ b/perl-install/modules/any_conf.pm
@@ -1,4 +1,4 @@
-package modules::any_conf; # $Id$
+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) {
 		$_ = '';
@@ -203,11 +200,6 @@ sub read_raw {
 	s/#.*$//;
 	s/\s+$//;
 
-	# Fix upgrade from ALSA < 0.9.0:
-	s/\b(snd-card-)/snd-/g;
-	# Fix upgrade for unified VIA driver:
-	s/\b(snd-via686|snd-via8233)\b/snd-via82xx/g;
-
 	my ($type, $module, $val) = split(' ', $_, 3) or next;
 
 	$c{$module}{$type} = $val;
diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm
index ca2a90f42..dae135889 100644
--- a/perl-install/modules/interactive.pm
+++ b/perl-install/modules/interactive.pm
@@ -1,4 +1,4 @@
-package modules::interactive; # $Id$
+package modules::interactive;
 
 use modules;
 use common;
@@ -20,8 +20,9 @@ sub config_window {
         return;
     }
     if ($in->ask_from(N("Module configuration"), N("You can configure each parameter of the module here."), \@l)) {
-	   my $options = join(' ', map { if_(defined $conf{$_}, "$_=$conf{$_}") } keys %conf);
-	   if ($options) {
+	   my $options = join(' ', map { if_($conf{$_} =~ /^\S+$/, "$_=$conf{$_}") } keys %conf);
+	   my $old_options = $modules_conf->get_options($data->{driver});
+	   if ($options ne $old_options) {
 	       $modules_conf->set_options($data->{driver}, $options);
 	       $modules_conf->write;
 	   }
@@ -80,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/ide|scsi|hardware_raid|sata|firewire' => N_("Installing driver for hard 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 {
@@ -96,7 +97,7 @@ sub wait_load_module {
 	    N("Installing driver for %s card %s", $category, $text);
 	}
     };
-    $in->wait_message('', $msg);
+    $in->wait_message(N("Configuring Hardware"), $msg);
 }
 
 sub load_module__ask_options {
diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm
index 76f3fbee0..7989096f8 100644
--- a/perl-install/modules/modprobe_conf.pm
+++ b/perl-install/modules/modprobe_conf.pm
@@ -1,7 +1,8 @@
-package modules::modprobe_conf; # $Id$
+package modules::modprobe_conf;
 
 use log;
 use common;
+# perl_checker: require modules::any_conf
 
 our @ISA = qw(modules::any_conf);
 
@@ -102,7 +103,7 @@ sub parse_non_virtual {
 sub unparse_non_virtual {
     my ($module, $mode, $before, $after) = @_;
     ($before ? "$before; " : '')
-      . "/sbin/modprobe --first-time $mode $module" 
+      . (($before || $after) ? "/sbin/modprobe --first-time $mode $module" : '')
 	. ($after ? " && { $after; /bin/true; }" : '');    
 }
 
diff --git a/perl-install/modules/modules_conf.pm b/perl-install/modules/modules_conf.pm
index 2bfc2ce65..be4b8fca4 100644
--- a/perl-install/modules/modules_conf.pm
+++ b/perl-install/modules/modules_conf.pm
@@ -1,7 +1,8 @@
-package modules::modules_conf; # $Id$
+package modules::modules_conf;
 
 use log;
 use common;
+# perl_checker: require modules::any_conf
 
 our @ISA = qw(modules::any_conf);
 
diff --git a/perl-install/modules/parameters.pm b/perl-install/modules/parameters.pm
index 2af5ce951..36990b5d1 100644
--- a/perl-install/modules/parameters.pm
+++ b/perl-install/modules/parameters.pm
@@ -1,4 +1,4 @@
-package modules::parameters; # $Id$
+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";