diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/network/netconnect.pm | 14 | ||||
| -rwxr-xr-x | perl-install/standalone/drakconnect | 3 |
2 files changed, 4 insertions, 13 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); } diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index d6668acfa..a8088fcf3 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -90,8 +90,8 @@ my $profile_combo = gtksignal_connect(Gtk2::OptionMenu->new, changed => sub { return if $::ignore_profile_change; my $selected_profile = $combo->get_text; return if $selected_profile eq $netcnx->{PROFILE}; - set_profiles($selected_profile) if $combo->window; # is realized?; $netcnx->{PROFILE} = $selected_profile; + set_profiles($netcnx) if $combo->window; # is realized?; }); sub update_profiles { @@ -359,7 +359,6 @@ sub update_list() { sub apply() { network::sethostname($netc); - network::netconnect::save_conf($netcnx); $netcnx->{type} eq 'modem' and network::modem::ppp_configure($in, $netcnx->{$netcnx->{type}}); $netcnx->{type} eq 'isdn_internal' and network::isdn::isdn_write_config_backend($netcnx->{$netcnx->{type}}, $netc, $netcnx); #$light |