summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakproxy
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-29 11:50:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-29 11:50:19 +0000
commit838b9f0b8668a4c81c39c9ea9f777952f1b46a0a (patch)
tree6901501a44ee8e4e9fe03f106b3c7d2f8a7e40a4 /perl-install/standalone/drakproxy
parent4f39c8ec7dc57153ff67d77c8e497c5effa63770 (diff)
downloaddrakx-backup-do-not-use-838b9f0b8668a4c81c39c9ea9f777952f1b46a0a.tar
drakx-backup-do-not-use-838b9f0b8668a4c81c39c9ea9f777952f1b46a0a.tar.gz
drakx-backup-do-not-use-838b9f0b8668a4c81c39c9ea9f777952f1b46a0a.tar.bz2
drakx-backup-do-not-use-838b9f0b8668a4c81c39c9ea9f777952f1b46a0a.tar.xz
drakx-backup-do-not-use-838b9f0b8668a4c81c39c9ea9f777952f1b46a0a.zip
- 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)
Diffstat (limited to 'perl-install/standalone/drakproxy')
-rwxr-xr-xperl-install/standalone/drakproxy7
1 files changed, 3 insertions, 4 deletions
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);