diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-08-23 19:15:05 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-08-23 19:15:05 +0000 |
| commit | cef02125408009f292e059e303cc43d15adbcd37 (patch) | |
| tree | b1a87c71d750140e9bd30a234d21963206c9a275 /perl-install/network | |
| parent | 7f4a6f2c180d5ae22c59f1fac6485d6f1f4d85f1 (diff) | |
| download | drakx-cef02125408009f292e059e303cc43d15adbcd37.tar drakx-cef02125408009f292e059e303cc43d15adbcd37.tar.gz drakx-cef02125408009f292e059e303cc43d15adbcd37.tar.bz2 drakx-cef02125408009f292e059e303cc43d15adbcd37.tar.xz drakx-cef02125408009f292e059e303cc43d15adbcd37.zip | |
florin fixes for multiple NIC boxes
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/netconnect.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 7d7464872..7474b9b66 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -370,7 +370,7 @@ sub save_conf { "SystemName=" . do { $netc->{HOSTNAME} =~ /([^\.]*)\./; $1 } . " DomainName=" . do { $netc->{HOSTNAME} =~ /\.(.*)/; $1 } . " InternetAccessType=" . do { if ($netcnx->{type}) { $netcnx->{type} } else { $netc->{GATEWAY} ? "lan" : "" } } . " -InternetInterface=" . ($netc->{GATEWAY} && (!$netcnx->{type} || $netcnx->{type} eq 'lan') ? $netc->{NET_DEVICE} : $netcnx->{NET_INTERFACE}) . " +InternetInterface=" . ($netc->{GATEWAY} && (!$netcnx->{type} || $netcnx->{type} eq 'lan') ? $netc->{GATEWAYDEV} : $netcnx->{NET_INTERFACE}) . " InternetGateway=$netc->{GATEWAY} DNSPrimaryIP=$netc->{dnsServer} DNSSecondaryIP=$netc->{dnsServer2} @@ -594,14 +594,14 @@ sub load_conf { #- ensures the migration from old config files sub read_raw_net_conf { my ($suffix) = @_; - my $dir = "$::prefix/etc/sysconfig"; + my $dir = "$::prefix/etc/sysconfig/network-scripts"; $suffix = $suffix ? ".$suffix" : ''; rename "$dir/draknet$suffix", "$dir/drakconnect$suffix"; - getVarsFromSh("$dir/drakconnect$suffix"); + getVarsFromSh("$dir/drakconnect_conf"); } sub get_net_device { - ${{ read_raw_net_conf() }}{NET_DEVICE}; + ${{ read_raw_net_conf() }}{InternetInterface}; } sub read_net_conf { |