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

2 files changed, 9 insertions, 2 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:
diff --git a/iw/autopart_type.py b/iw/autopart_type.py
index 81393cd9b..fba6432bc 100644
--- a/iw/autopart_type.py
+++ b/iw/autopart_type.py
@@ -83,8 +83,10 @@ def whichToResize(partitions, diskset, intf):
             if req.targetSize is not None:
                 combo.set_active_iter(i)
                 found = True
-            if biggest < 0 or req.size > getActive(combo).size:
-                biggest = i
+            else:
+                if biggest < 0 or req.size > store.get_value(biggest, 1).size:
+                    biggest = i
+
     if not found and biggest > 0:
         combo.set_active_iter(biggest)