summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2002-09-13 19:01:06 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2002-09-13 19:01:06 +0000
commit44062e68bc833918fb48685071bc6131a3deebd5 (patch)
treeb50672c8d16d54f1c3529b6c2bca5922a9b4f4cb
parent48f444aaf23bb5fe4758d141a87456f256be179b (diff)
downloaddrakx-backup-do-not-use-44062e68bc833918fb48685071bc6131a3deebd5.tar
drakx-backup-do-not-use-44062e68bc833918fb48685071bc6131a3deebd5.tar.gz
drakx-backup-do-not-use-44062e68bc833918fb48685071bc6131a3deebd5.tar.bz2
drakx-backup-do-not-use-44062e68bc833918fb48685071bc6131a3deebd5.tar.xz
drakx-backup-do-not-use-44062e68bc833918fb48685071bc6131a3deebd5.zip
- fix old conf files name (thx titi)
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 4f9fee0ff..75f64bbac 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -591,7 +591,7 @@ sub load_conf {
sub read_raw_net_conf {
my ($suffix) = @_;
my $dir = "$::prefix/etc/sysconfig/network-scripts";
- $suffix = $suffix ? ".$suffix" : '';
+# $suffix = $suffix ? ".$suffix" : '';
rename "$dir/draknet$suffix", "$dir/drakconnect$suffix";
getVarsFromSh("$dir/drakconnect_conf");
}
@@ -602,7 +602,7 @@ sub get_net_device {
sub read_net_conf {
my ($prefix, $netcnx, $netc)=@_;
- add2hash($netcnx, { read_raw_net_conf() });
+ add2hash($netcnx, { read_raw_net_conf('_conf') });
$netc->{$_} = $netcnx->{$_} foreach 'NET_DEVICE', 'NET_INTERFACE';
$netcnx->{$netcnx->{type}}||={};
add2hash($netcnx->{$netcnx->{type}}, { read_raw_net_conf($netcnx->{type}) });