summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-16 23:05:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-16 23:05:21 +0000
commit7d96e1c461b53d8f9ff6cf1f3e81e6e3fc08dcc1 (patch)
treee9ba82e3edb8dc5ebec89f742f84364c66af39d3
parent332ffac68873f476cb0f72c2f5e41eacbdd6e830 (diff)
downloaddrakx-7d96e1c461b53d8f9ff6cf1f3e81e6e3fc08dcc1.tar
drakx-7d96e1c461b53d8f9ff6cf1f3e81e6e3fc08dcc1.tar.gz
drakx-7d96e1c461b53d8f9ff6cf1f3e81e6e3fc08dcc1.tar.bz2
drakx-7d96e1c461b53d8f9ff6cf1f3e81e6e3fc08dcc1.tar.xz
drakx-7d96e1c461b53d8f9ff6cf1f3e81e6e3fc08dcc1.zip
drop proxy configuration step.
rationale: - miscellaneous_choose() was reintroduced in network::network since it was still needed by drakproxy - anyway configuring proxies is: o not supposed to be done while configuring network interfaces o duplicated with drakproxy and the like o removed in new drakconnect specs
-rw-r--r--perl-install/network/netconnect.pm22
1 files changed, 0 insertions, 22 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 9b3b90595..0f113038c 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -748,28 +748,6 @@ You may also enter the IP address of the gateway if you have one."),
post => sub { $::isInstall ? "miscellaneous_choose" : "apply_settings" },
},
- miscellaneous_choose =>
- {
- name => N("Proxies configuration"),
- data => [
- { label => N("HTTP proxy"), val => \$::o->{miscellaneous}->{http_proxy} },
- { label => N("FTP proxy"), val => \$::o->{miscellaneous}->{ftp_proxy} },
- ],
- complete => sub {
- if ($::o->{miscellaneous}->{http_proxy} !~ m,^($|http://),) {
- $in->ask_warn('', N("Proxy should be http://..."));
- return 1, 0;
- }
- if ($::o->{miscellaneous}->{ftp_proxy} !~ m,^($|ftp://|http://),) {
- $in->ask_warn('', N("URL should begin with 'ftp:' or 'http:'"));
- return 1, 1;
- }
- 0;
- },
- # FIXME: call ether_conf();
- post => sub { return !$::isInstall ? "apply_settings" : "network_on_boot" },
- },
-
apply_settings =>
{
name => N("Configuration is complete, do you want to apply settings ?"),