diff options
| author | Damien Chaumette <dchaumette@mandriva.com> | 2003-09-08 16:15:03 +0000 |
|---|---|---|
| committer | Damien Chaumette <dchaumette@mandriva.com> | 2003-09-08 16:15:03 +0000 |
| commit | 7203a3550e2636ee44f9f76212051a1fbc51d64d (patch) | |
| tree | 88c471307b6aff63dc88288cb873d16e2ae744a7 /perl-install/network | |
| parent | 6cb8c73f64b07398a3de9440bdad0262d271e4b2 (diff) | |
| download | drakx-backup-do-not-use-7203a3550e2636ee44f9f76212051a1fbc51d64d.tar drakx-backup-do-not-use-7203a3550e2636ee44f9f76212051a1fbc51d64d.tar.gz drakx-backup-do-not-use-7203a3550e2636ee44f9f76212051a1fbc51d64d.tar.bz2 drakx-backup-do-not-use-7203a3550e2636ee44f9f76212051a1fbc51d64d.tar.xz drakx-backup-do-not-use-7203a3550e2636ee44f9f76212051a1fbc51d64d.zip | |
- do not call anymore network::netconnect::save_conf
- good set_profiles($netcnx) call
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/netconnect.pm | 14 |
1 files changed, 3 insertions, 11 deletions
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); } |