corrected module.conf update, net conf saving, and no wizard by default.

2 files changed, 8 insertions, 4 deletions

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 939eb1f44..1d7909906 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -569,11 +569,15 @@ sub write_conf {
     rename "$prefix/etc/conf.modules", $file; #- make the switch to new name if needed
 
     #- remove the post-install supermount stuff. We now do it in /etc/modules
-    # Substitute new aliases in modules.conf (if config has changed)
+    #- Substitute new aliases in modules.conf (if config has changed)
+    substInFile { $_ = '' if /^post-install supermount/ } $file;
     substInFile {
-	$_ = '' if /^post-install supermount/;
 	my ($type,$alias,$module) = split /\s+/, $_;
-	$_ = "$type $alias $conf{$alias}{alias} \n" if ($type ne "loaded" && $conf{$alias}{alias} && $conf{$alias}{alias} !~ /$module/);
+	if ($type ne "loaded"     &&
+	    $conf{$alias}{alias}  &&
+	    $conf{$alias}{alias} !~ /$module/)  {
+	    $_ = "$type $alias $conf{$alias}{alias} \n"; 
+	}
     } $file;
 
     my $written = read_conf($file);
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 174481d9a..eb2fede38 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -40,7 +40,7 @@ local $_ = join '', @ARGV;
 
 my $netcnx = {};
 
-$::isWizard = 1;
+$::isWizard = 0;
 $::wizard_xpm = "/usr/share/pixmaps/internet.xpm";
 #$::force_xf3 = /-xf3/;
 #$::beginner = /-beginner/;