diff options
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-x | perl-install/standalone/drakconnect | 5 | ||||
-rwxr-xr-x | perl-install/standalone/drakproxy | 7 |
2 files changed, 6 insertions, 6 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); diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index f09d86199..0b50f23d2 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -25,9 +25,8 @@ use interactive; use network::network; use any; -$::o->{miscellaneous} ||= {}; -$::o->{miscellaneous} = { getVarsFromSh('/etc/profile.d/proxy.sh') }; +my $u = { getVarsFromSh('/etc/profile.d/proxy.sh') }; my $in = 'interactive'->vnew('su', 'network'); -network::network::miscellaneousNetwork($in, 1, 1); -any::miscellaneousNetwork(''); +network::network::miscellaneous_choose($in, $u, 1, 1); +network::network::proxy_configure($u); $in->exit(0); |