- move any::pppConfig() to network::modem::ppp_configure()

- move any::miscellaneousNetwork() to network::network::proxy_configure()
  (and uses the parameter instead of $::o->{miscellaneous})
- move network::network::miscellaneousNetwork() to network::network::miscellaneous_choose()
  (and do not export it)
  (and uses a parameter instead of $::o->{miscellaneous})
- move network::modem::pppConfig() to network::modem::ppp_choose()
  (and change parameter order, and drop unused parameter $intf)
- do not export network::network::write_interface_conf()
  (since it is only used locally (?))
- cleanup network::network::write_interface_conf()
  (one still needs to pass $::o->{miscellaneous}{track_network_id} more
  cleanly, and use run_program::rooted when calling /sbin/ip)

1 files changed, 3 insertions, 2 deletions

diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index d428bcae6..a54775f02 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -27,6 +27,7 @@ use common;
 use network::netconnect;
 use network::ethernet;
 use network::tools;
+use network::modem;
 use network;
 use c;
 use any;
@@ -341,9 +342,9 @@ sub apply {
     $old_profile = $netcnx->{PROFILE} ? $netcnx->{PROFILE} : "default";
     network::netconnect::save_conf($netcnx, $netc, $intf);
 
-    $netcnx->{type} eq 'modem' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '');
+    $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}}, 1, $netc, $netcnx); #$light
-    $netcnx->{type} eq 'isdn_external' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '');
+    $netcnx->{type} eq 'isdn_external' and network::modem::ppp_configure($in, $netcnx->{$netcnx->{type}}, '');
     my $a = $netcnx->{type};
     $a =~ s/adsl_//;
     $netcnx->{type} =~ /adsl/ and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, $a, $netcnx);