summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-14 16:09:07 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-14 16:09:07 +0000
commit7f4b90ee62ff4c05ff9289164eba9cf8df530d51 (patch)
treef296bb013ff08a26b945c6bfd40aadd8c41e4159 /perl-install
parent50cbea4ca6eb5417228421db15e2326e478fbc4e (diff)
downloaddrakx-7f4b90ee62ff4c05ff9289164eba9cf8df530d51.tar
drakx-7f4b90ee62ff4c05ff9289164eba9cf8df530d51.tar.gz
drakx-7f4b90ee62ff4c05ff9289164eba9cf8df530d51.tar.bz2
drakx-7f4b90ee62ff4c05ff9289164eba9cf8df530d51.tar.xz
drakx-7f4b90ee62ff4c05ff9289164eba9cf8df530d51.zip
split out proxy configuration out of network interfaces configuration
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm14
1 files changed, 13 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 356d2e1c1..986376528 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1018,6 +1018,18 @@ sub summary {
},
};
+ $::o->{miscellaneous} ||= {};
+ push @l, {
+ group => N("Network & Internet"),
+ label => N("Proxies"),
+ val => sub { $::o->{miscellaneous}{http_proxy} || $::o->{miscellaneous}{ftp_proxy} ? N("configured") : N("not configured") },
+ clicked => sub {
+ require network::network;
+ network::network::miscellaneous_choose($o, $::o->{miscellaneous});
+ network::network::proxy_configure($::o->{miscellaneous}) if $::testing;
+ },
+ };
+
push @l, {
group => N("Security"),
label => N("Security Level"),
@@ -1071,7 +1083,7 @@ sub summary {
};
my $check_complete = sub {
- $o->{raw_X} || !pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed ||
+ $o->{raw_X} || !$::testing && !pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed ||
$o->ask_yesorno('', N("You have not configured X. Are you sure you really want this?"));
};