diff options
| author | damien <damien@mandriva.com> | 2001-02-03 15:01:49 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-02-03 15:01:49 +0000 |
| commit | 85bde5bc3e1d435c87a9f092b058836cc8bea360 (patch) | |
| tree | b7fe32b4be3e6c613782f4d80e22f94942b2da9c | |
| parent | 5d36051d0e005fd43817dad6cd49885b3349c538 (diff) | |
| download | drakx-backup-do-not-use-85bde5bc3e1d435c87a9f092b058836cc8bea360.tar drakx-backup-do-not-use-85bde5bc3e1d435c87a9f092b058836cc8bea360.tar.gz drakx-backup-do-not-use-85bde5bc3e1d435c87a9f092b058836cc8bea360.tar.bz2 drakx-backup-do-not-use-85bde5bc3e1d435c87a9f092b058836cc8bea360.tar.xz drakx-backup-do-not-use-85bde5bc3e1d435c87a9f092b058836cc8bea360.zip | |
corrected module.conf update, net conf saving, and no wizard by default.
| -rw-r--r-- | perl-install/modules.pm | 10 | ||||
| -rwxr-xr-x | perl-install/standalone/draknet | 2 |
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/; |