diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-06-23 05:07:06 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-06-23 05:07:06 +0000 |
| commit | 81a1726cce6cadfd65131c8a27a545cfc7e2a31b (patch) | |
| tree | dacc67a18b2eeb40d33d33ef5e943f940afb6c7e | |
| parent | 299c668059fb000ec10d7af42e25861feda4f772 (diff) | |
| download | drakx-backup-do-not-use-81a1726cce6cadfd65131c8a27a545cfc7e2a31b.tar drakx-backup-do-not-use-81a1726cce6cadfd65131c8a27a545cfc7e2a31b.tar.gz drakx-backup-do-not-use-81a1726cce6cadfd65131c8a27a545cfc7e2a31b.tar.bz2 drakx-backup-do-not-use-81a1726cce6cadfd65131c8a27a545cfc7e2a31b.tar.xz drakx-backup-do-not-use-81a1726cce6cadfd65131c8a27a545cfc7e2a31b.zip | |
use http proxy settings from stage1 as post-install proxy settings for both http and ftp connections
| -rw-r--r-- | perl-install/install_steps.pm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 29ad182da..d1e3b9ff3 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -637,6 +637,18 @@ sub configureNetwork { require network::network; network::network::configure_network($o->{net}, $o, $o->{modules_conf}); configure_firewall($o) if !$o->{isUpgrade}; + + #- only a http proxy can be used by stage1 + #- the method is http even for ftp connections through a http proxy + #- use this http proxy for both http and ftp connections + if ($o->{method} eq "http" && $ENV{PROXY}) { + my $proxy = "http://$ENV{PROXY}" . ($ENV{PROXYPORT} && ":$ENV{PROXYPORT}"); + add2hash($o->{miscellaneous} ||= {}, { + http_proxy => $proxy, + ftp_proxy => $proxy, + }); + network::network::proxy_configure($::o->{miscellaneous}); + } } sub configure_firewall { |