diff options
| -rw-r--r-- | perl-install/network/tools.pm | 8 | ||||
| -rwxr-xr-x | perl-install/standalone/drakconnect | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index d908ceabb..082a6bda4 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -221,4 +221,12 @@ sub is_dynamic_host { any { defined $_->{DHCP_HOSTNAME} } values %$intf; } +sub reread_net_conf { + my ($netcnx, $netc, $intf) = @_; + network::netconnect::read_net_conf('', $netcnx, $netc); + modules::load_category('net'); + network::netconnect::load_conf($netcnx, $netc, $intf); + network::network::probe_netcnx_type('', $netc, $intf, $netcnx); +} + 1; diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index f3f0447bb..1e878eec8 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -51,7 +51,7 @@ if ($in->isa('interactive::gtk')) { require ugtk2; ugtk2->import(qw(:create :dialogs :helpers :wrappers)); } -reread_net_conf(); +network::tools::reread_net_conf($netcnx, $netc, $intf); $::Wizard_title = N("Network & Internet Configuration"); $::Wizard_pix_up = "drakconnect.png"; @@ -212,7 +212,7 @@ sub manage { /^ippp/ and $p->{isdn} = { kind => $_ }; /^ppp0/ and $p->{modem} = { kind => $_ }; }; - + $window->{rwindow}->add(gtkpack_(Gtk2::VBox->new, 0, $interface_menu = gtksignal_connect(Gtk2::OptionMenu->new, changed => sub { @@ -996,9 +996,3 @@ Please run \"Internet access\" in control center.")); ugtk2->exit(0); } -sub reread_net_conf() { - network::netconnect::read_net_conf('', $netcnx, $netc); - modules::load_category('net'); - network::netconnect::load_conf($netcnx, $netc, $intf); - network::network::probe_netcnx_type('', $netc, $intf, $netcnx); -} |