summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-09 20:38:25 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-09 20:38:25 +0000
commitd92b13883fbf6acce6c39cb76484accc56bce0c3 (patch)
treecfc9c50359dca43fb7169bdae397b1208b329f79 /perl-install/install_steps.pm
parenteb53575902c0282896e92d7d6d76a89bca420e5a (diff)
downloaddrakx-d92b13883fbf6acce6c39cb76484accc56bce0c3.tar
drakx-d92b13883fbf6acce6c39cb76484accc56bce0c3.tar.gz
drakx-d92b13883fbf6acce6c39cb76484accc56bce0c3.tar.bz2
drakx-d92b13883fbf6acce6c39cb76484accc56bce0c3.tar.xz
drakx-d92b13883fbf6acce6c39cb76484accc56bce0c3.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm13
1 files changed, 10 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 2f5de3dbc..8f3af44ef 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -246,7 +246,7 @@ sub configureNetwork($) {
install_any::pkg_install($o, "dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp|bootp)$/ } @{$o->{intf}};
#-res_init(); #- reinit the resolver so DNS changes take affect
- pppConfig($o);
+ miscellaneousNetwork($o);
}
#------------------------------------------------------------------------------
@@ -297,6 +297,8 @@ sub pppConfig {
foreach ("$o->{prefix}/root", "$o->{prefix}/etc/skel") {
template2file("/usr/share/kppprc.in", "$_/.kde/share/config/kppprc", %toreplace) if -d "$_/.kde/share/config";
}
+
+ miscellaneousNetwork($o);
}
#------------------------------------------------------------------------------
@@ -474,6 +476,13 @@ sub setupXfree {
}
#------------------------------------------------------------------------------
+sub miscellaneousNetwork {
+ my ($o) = @_;
+ setVarsInSh ("$o->{prefix}/etc/profile.d/proxy.sh", $o->{miscellaneous}, qw(http_proxy ftp_proxy));
+ setVarsInCsh("$o->{prefix}/etc/profile.d/proxy.csh", $o->{miscellaneous}, qw(http_proxy ftp_proxy));
+}
+
+#------------------------------------------------------------------------------
sub miscellaneous {
my ($o) = @_;
setVarsInSh("$o->{prefix}/etc/sysconfig/system", {
@@ -482,8 +491,6 @@ sub miscellaneous {
TYPE => $o->{installClass},
SECURITY => $o->{security},
});
- setVarsInSh ("$o->{prefix}/etc/profile.d/proxy.sh", $o->{miscellaneous}, qw(http_proxy ftp_proxy));
- setVarsInCsh("$o->{prefix}/etc/profile.d/proxy.csh", $o->{miscellaneous}, qw(http_proxy ftp_proxy));
}
#------------------------------------------------------------------------------