[PATCH 2/3] Propagate anaconda.methodstr into ksdata.method.

[David Lehman <dlehman@xxxxxxxxxx>]

---
 anaconda |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/anaconda b/anaconda
index 5cc670e..b0384c6 100755
--- a/anaconda
+++ b/anaconda
@@ -733,6 +733,32 @@ if __name__ == "__main__":
     else:
         ksdata = kickstart.AnacondaKSHandler(anaconda)
 
+    # set ksdata.method based on anaconda.method if it isn't already set
+    if anaconda.methodstr and not ksdata.method.method:
+        if anaconda.methodstr.startswith("cdrom"):
+            ksdata.method.method = "cdrom"
+        elif anaconda.methodstr.startswith("nfs"):
+            ksdata.method.method = "nfs"
+            url = anaconda.methodstr.split(":", 1)[1]
+            (opts, server, path) = iutil.parseNfsUrl(url)
+            ksdata.method.server = server
+            ksdata.method.dir = path
+            ksdata.method.opts = opppts
+        elif anaconda.methodstr.startswith("hd:"):
+            ksdata.method.method = "harddrive"
+            url = anaconda.methodstr.split(":", 1)[1]
+            if url.count(":") == 1:
+                (device, path) = url.split(":")
+            else:
+                (device, fstype, path) = url.split(":")
+            ksdata.method.partition = device
+            ksdata.method.dir = path
+        elif anaconda.methodstr.startswith("http") or \
+             anaconda.methodstr.startswith("ftp"):
+            ksdata.method.method = "url"
+            ksdata.method.nosslverify = flags.nosslverify
+            ksdata.method.proxy = anaconda.proxy    # FIXME: username/password
+
     # now start the interface
     setupDisplay(anaconda, opts)
 
-- 
1.7.9.1

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