[RHEL6-BRANCH 1/2] set PROXY environmental variables (#800388)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Brian C. Lane" <bcl@xxxxxxxxxx>

pre/post scripts can now use the following environmental variables:
PROXY or http_proxy
PROXY_USER
PROXY_PASSWORD

PROXY_USER and/or PROXY_PASSWORD may not be set, depending on the proxy
settings passed to anaconda.

Resolves: rhbz#800388
---
 anaconda |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/anaconda b/anaconda
index b17d0e5..e5a226d 100755
--- a/anaconda
+++ b/anaconda
@@ -729,14 +729,22 @@ if __name__ == "__main__":
     if opts.proxy:
         anaconda.proxy = opts.proxy
 
+        # Set environmental variables to be used by pre/post scripts
+        log.debug("PROXY=%s", opts.proxy)
+        os.environ['PROXY'] = anaconda.proxy
+        # For wget/curl use
+        os.environ['http_proxy'] = anaconda.proxy
+
         if opts.proxyAuth:
             filename = opts.proxyAuth
             ret = open(filename, "r").readlines()
             os.unlink(filename)
 
             anaconda.proxyUsername = ret[0].rstrip()
+            os.environ['PROXY_USER'] = anaconda.proxyUsername
             if len(ret) == 2:
                 anaconda.proxyPassword = ret[1].rstrip()
+                os.environ['PROXY_PASSWORD'] = anaconda.proxyPassword
 
     if opts.updateSrc:
         anaconda.updateSrc = opts.updateSrc
-- 
1.7.7.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux