From d92b13883fbf6acce6c39cb76484accc56bce0c3 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 9 Nov 1999 20:38:25 +0000
Subject: *** empty log message ***

---
 perl-install/install_steps.pm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'perl-install/install_steps.pm')

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);
 }
 
 #------------------------------------------------------------------------------
@@ -473,6 +475,13 @@ sub setupXfree {
     my ($o) = @_;
 }
 
+#------------------------------------------------------------------------------
+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) = @_;
@@ -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)); 
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1