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

[rhel6-branch] Write --noverifyssl to repos and urls in kickstart where fit.



Resolves: rhbz#678576
---
 instdata.py   |    5 ++++-
 yuminstall.py |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/instdata.py b/instdata.py
index a0f4997..9f7c166 100644
--- a/instdata.py
+++ b/instdata.py
@@ -252,7 +252,10 @@ class InstallData:
                     (method, server, dir) = m.split(":")
                     f.write("nfs --server=%s --dir=%s\n" % (server, dir))
             elif m.startswith("ftp://";) or m.startswith("http"):
-                f.write("url --url=%s\n" % urllib.unquote(m))
+                ssl = ""
+                if flags.noverifyssl:
+                    ssl = " --noverifyssl"
+                f.write("url --url=%s%s\n" % (urllib.unquote(m), ssl))
 
         self.instLanguage.writeKS(f)
         if not self.isHeadless:
diff --git a/yuminstall.py b/yuminstall.py
index be6796f..a00d026 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1371,7 +1371,7 @@ debuglevel=10
                     if repo.needsNetwork() and not network.hasActiveNetDev():
                         if anaconda.intf.enableNetwork():
                             repo.mirrorlistparsed = False
-                            continue 
+                            continue
 
                         urlgrabber.grabber.reset_curl_obj()
 
@@ -2024,6 +2024,9 @@ debuglevel=10
             if repo.exclude:
                 line += " --excludepkgs=\"%s\"" % ",".join(repo.exclude)
 
+            if not repo.sslverify:
+                line += " --noverifyssl"
+
             line += "\n"
 
             f.write(line)
-- 
1.7.3.3


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