[PATCH 4/4] Make sure all kickstart partition reqs get appropriate weight setting.

[David Lehman <dlehman@xxxxxxxxxx>]

---
 pyanaconda/kickstart.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 23c624a..08d5b4a 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -798,17 +798,14 @@ class PartitionData(commands.partition.F12_PartData):
             else:
                 type = storage.defaultFSType
         elif self.mountpoint == 'appleboot':
-            type = "Apple Bootstrap"
+            type = "appleboot"
             self.mountpoint = ""
-            kwargs["weight"] = self.anaconda.platform.weight(fstype="appleboot")
         elif self.mountpoint == 'prepboot':
-            type = "PPC PReP Boot"
+            type = "prepboot"
             self.mountpoint = ""
-            kwargs["weight"] = self.anaconda.platform.weight(fstype="prepboot")
         elif self.mountpoint == 'biosboot':
             type = "biosboot"
             self.mountpoint = ""
-            kwargs["weight"] = self.anaconda.platform.weight(fstype="biosboot")
         elif self.mountpoint.startswith("raid."):
             type = "mdmember"
             kwargs["name"] = self.mountpoint
@@ -843,7 +840,6 @@ class PartitionData(commands.partition.F12_PartData):
                 self.anaconda.ksdata.onPart[kwargs["name"]] = self.onPart
             self.mountpoint = ""
         elif self.mountpoint == "/boot/efi":
-            kwargs["weight"] = self.anaconda.platform.weight(mountpoint="/boot/efi")
             if iutil.isMactel():
                 type = "hfs+"
             else:
@@ -937,6 +933,13 @@ class PartitionData(commands.partition.F12_PartData):
             except KeyError:
                 pass
 
+            if "format" in kwargs:
+                # set weight based on fstype and mountpoint
+                mpt = getattr(kwargs["format"], "mountpoint", None)
+                fstype = kwargs["format"].type
+                kwargs["weight"] = self.anaconda.platform.weight(fstype=fstype,
+                                                                 mountpoint=mpt)
+
             request = storage.newPartition(**kwargs)
 
             storage.createDevice(request)
-- 
1.7.7.6

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