merge changes from 7-2-branch

1 files changed, 21 insertions, 5 deletions

diff --git a/autopart.py b/autopart.py
index 284e57cf0..148a34bc4 100644
--- a/autopart.py
+++ b/autopart.py
@@ -801,9 +801,14 @@ def doClearPartAction(partitions, diskset):
                 delete = DeleteSpec(drive, part.geom.start, part.geom.end)
                 partitions.addDelete(delete)
 
-            if (iutil.getArch() == "ia64") and (linuxOnly == 1):
-                if not part.is_flag_available(parted.PARTITION_BOOT):
-                    continue
+            # ia64 autopartitioning is strange as /boot/efi is vfat --
+            # if linuxonly and have an msdos partition and it has the
+            # bootable flag set, do not delete it and make it our
+            # /boot/efi as it could contain system utils.
+            # doesn't apply on kickstart installs or if no boot flag
+            if ((iutil.getArch() == "ia64") and (linuxOnly == 1)
+                and (not partitions.isKickstart) and
+                part.is_flag_available(parted.PARTITION_BOOT)):
                 if part.fs_type and part.fs_type.name == "FAT":
                     if part.get_flag(parted.PARTITION_BOOT):
                         req = partitions.getRequestByDeviceName(get_partition_name(part))
@@ -820,7 +825,6 @@ def doClearPartAction(partitions, diskset):
 
             part = disk.next_partition(part)
 
-
     # set the diskset up
     doPartitioning(diskset, partitions, doRefresh = 1)
     for drive in drives:
@@ -851,7 +855,19 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch):
     
     # if no auto partition info in instclass we bail
     if len(partitions.autoPartitionRequests) < 1:
-        return DISPATCH_NOOP
+        #return DISPATCH_NOOP
+        # XXX if we noop, then we fail later steps... let's just make it
+        # the workstation default.  should instead just never get here
+        # if no autopart info
+        autorequests = [ ("/", None, 1100, None, 1, 1) ]
+
+        bootreq = getAutopartitionBoot()
+        if bootreq:
+            autorequests.append(bootreq)
+
+        (minswap, maxswap) = iutil.swapSuggestion()
+        autorequests.append((None, "swap", minswap, maxswap, 1, 1))
+        partitions.autoPartitionRequests = autoCreatePartitionRequests(autorequests)
 
     # reset drive and request info to original state
     # XXX only do this if we're dirty