Merge branch 'master' of ssh://git.fedorahosted.org/git/anaconda

1 files changed, 5 insertions, 0 deletions

diff --git a/anaconda b/anaconda
index 295a3ef90..e0095ee7c 100755
--- a/anaconda
+++ b/anaconda
@@ -675,6 +675,11 @@ if __name__ == "__main__":
         if opts.method[0] == '@':
             expandFTPMethod(opts)
 
+        # FIXME: this is terrible, but it gets the desired behavior without
+        # requiring scary loader changes at this point
+        if flags.cmdline.has_key("stage2") and flags.cmdline.has_key("method"):
+            opts.method = flags.cmdline["method"]
+
         anaconda.setMethodstr(opts.method)
 
     if opts.module: