[rhel7-branch 11/29] Add noverifyssl and proxy support to dracut ks handling (#1116858)
bcl
installerbot-noreply at redhat.com
Wed Jun 3 00:36:43 UTC 2015
From: "Brian C. Lane" <bcl at redhat.com>
When the kickstart is used to point to the location of the tree using
https it needs to also set rd.noverifyssl if the --noverifyssl flag is
set on the url install method on the kickstart.
Also add support for --proxy being passed to proxy cmdline option,
passed on to curl by dracut.
Resolves: rhbz#1116858
(cherry picked from commit 79d27a00d6d58781a652472a17075ab13f978507)
Related: rhbz#1196721
---
dracut/parse-kickstart | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 90c2e8b..cd1ab73 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -107,8 +107,13 @@ class NFS(commands.nfs.FC6_NFS):
class URL(commands.url.F18_Url):
def dracut_args(self, args, lineno, obj):
- # FIXME: self.proxy, self.noverifyssl
- return "inst.repo=%s" % self.url
+ args = ["inst.repo=%s" % self.url]
+ if self.noverifyssl:
+ args.append("rd.noverifyssl")
+ if self.proxy:
+ args.append("proxy=%s" % self.proxy)
+
+ return "\n".join(args)
class Updates(commands.updates.F7_Updates):
def dracut_args(self, args, lineno, obj):
--
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/25e90f7bd8eb571f48020f25c4bfabb1a515f749
More information about the anaconda-patches
mailing list