From 7203a3550e2636ee44f9f76212051a1fbc51d64d Mon Sep 17 00:00:00 2001
From: Damien Chaumette <dchaumette@mandriva.com>
Date: Mon, 8 Sep 2003 16:15:03 +0000
Subject: - do not call anymore network::netconnect::save_conf - good
 set_profiles($netcnx) call

---
 perl-install/network/netconnect.pm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index ceaf1373f..aaa2c351a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -274,14 +274,6 @@ fi
     }
 }
 
-sub save_conf {
-    my ($netcnx) = @_;
-    my $string = "# Connection type reminder
-name=$netcnx->{PROFILE}
-";
-    output_with_perm("$prefix/etc/sysconfig/drakconnect", 0600, $string);
-}
-
 sub set_profile {
     my ($netcnx) = @_;
     system("/sbin/set-netprofile $netcnx->{PROFILE}");
@@ -313,10 +305,10 @@ sub get_profiles() {
 }
 
 sub load_conf {
-    my ($netcnx, $netc, $intf) = @_; 
-    my $profile = { getVarsFromSh("$prefix/etc/sysconfig/drakconnect") };
+    my ($netcnx, $netc, $intf) = @_;
+    my $current = { getVarsFromSh("$prefix/etc/netprofile/current") };
     
-    $netcnx->{PROFILE} = $profile->{name};
+    $netcnx->{PROFILE} = $current->{PROFILE};
     network::read_all_conf($prefix, $netc, $intf);
 }
 
-- 
cgit v1.2.1