From 7d96e1c461b53d8f9ff6cf1f3e81e6e3fc08dcc1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 16 Jan 2004 23:05:21 +0000 Subject: 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 --- perl-install/network/netconnect.pm | 22 ---------------------- 1 file changed, 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 ?"), -- cgit v1.2.1