summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-10-09 09:30:50 +0000
committerOlivier Blin <oblin@mandriva.org>2004-10-09 09:30:50 +0000
commitef0535e8e07be73bd531b9e5a01fdbd5298a078c (patch)
treeac3716051dbde7046a7cdb0e29d8119562923f4c
parent06ce90f2c9458a59f7e513ab080e075a8bc2f1a4 (diff)
downloaddrakx-ef0535e8e07be73bd531b9e5a01fdbd5298a078c.tar
drakx-ef0535e8e07be73bd531b9e5a01fdbd5298a078c.tar.gz
drakx-ef0535e8e07be73bd531b9e5a01fdbd5298a078c.tar.bz2
drakx-ef0535e8e07be73bd531b9e5a01fdbd5298a078c.tar.xz
drakx-ef0535e8e07be73bd531b9e5a01fdbd5298a078c.zip
(configureNetwork2) remove /etc/sysconfig/network-scripts/ethX files
that may have been created by sagem scripts
-rw-r--r--perl-install/network/network.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 3fa1359ed..53ea5d6f5 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -441,7 +441,10 @@ sub configureNetwork2 {
#- symlink resolv.conf in install root too so that updates and suppl media can be added
symlink "$etc/resolv.conf", "/etc/resolv.conf";
}
- write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_", $intf->{$_}, $netc, $::prefix) foreach grep { !/^ppp\d+/ } keys %$intf;
+ foreach (grep { !/^ppp\d+/ } keys %$intf) {
+ unlink("$etc/sysconfig/network-scripts/$_");
+ write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_", $intf->{$_}, $netc, $::prefix);
+ }
add2hosts("$etc/hosts", $netc->{HOSTNAME}, "127.0.0.1") if $netc->{HOSTNAME};
add2hosts("$etc/hosts", "localhost", "127.0.0.1");