> -# pd.mountpoint = ""
> + elif pd.mountpoint == 'appleboot':
> + type = fileSystemTypeGet("Apple Bootstrap")
> + pd.mountpoint = ""
> + kwargs["weight"] = self.handler.anaconda.platform.weight(fstype="appleboot")
> + elif pd.mountpoint == 'prepboot':
> + type = fileSystemTypeGet("PPC PReP Boot")
> + pd.mountpoint = ""
> + kwargs["weight"] = self.handler.anaconda.platform.weight(fstype="prepboot")
> elif pd.mountpoint.startswith("raid."):
> type = "mdmember"
> kwargs["name"] = pd.mountpoint
s/fileSystemTypeGet/getFormat/g
> @@ -613,8 +615,9 @@ class Partition(commands.partition.F9_Partition):
>
> pd.mountpoint = ""
> elif pd.mountpoint == "/boot/efi":
> - type = "vfat"
> + type = fileSystemTypeGet("EFI System Partition")
> pd.fsopts = "defaults,uid=0,gid=0,umask=0077,shortname=winnt"
> + kwargs["weight"] = self.handler.anaconda.platform.weight(fstype="efi")
> else:
> if pd.fstype != "":
> type = pd.fstype
> diff --git a/storage/partitioning.py b/storage/partitioning.py
> index 8d8df75..5b32878 100644
> --- a/storage/partitioning.py
> +++ b/storage/partitioning.py
> @@ -86,19 +86,19 @@ def _schedulePartitions(anaconda, disks):
> # First pass is for partitions only. We'll do LVs later.
> #
> for request in anaconda.id.storage.autoPartitionRequests:
> - (mountpoint, fstype, size, maxsize, grow, asvol) = request
> - if asvol:
> + if request.asVol:
> continue
>
> - if fstype is None:
> - fstype = anaconda.id.storage.defaultFSType
> + if request.fstype is None:
> + request.fstype = anaconda.id.storage.defaultFSType
>
> - dev = anaconda.id.storage.newPartition(fmt_type=fstype,
> - size=size,
> - grow=grow,
> - maxsize=maxsize,
> - mountpoint=mountpoint,
> - disks=disks)
> + dev = anaconda.id.storage.newPartition(fmt_type=request.fstype,
> + size=request.size,
> + grow=request.grow,
> + maxsize=request.maxSize,
> + mountpoint=request.mountpoint,
> + disks=disks,
> + weight=request.weight)
>
> # schedule the device for creation
> anaconda.id.storage.createDevice(dev)
> @@ -129,20 +129,19 @@ def _scheduleLVs(anaconda, devs):
> #
> # Second pass, for LVs only.
> for request in anaconda.id.storage.autoPartitionRequests:
> - (mountpoint, fstype, size, maxsize, grow, asvol) = request
> - if not asvol:
> + if not request.asVol:
> continue
>
> - if fstype is None:
> - fstype = anaconda.id.storage.defaultFSType
> + if request.fstype is None:
> + request.fstype = anaconda.id.storage.defaultFSType
>
> # FIXME: move this to a function and handle exceptions
> dev = anaconda.id.storage.newLV(vg=vg,
> fmt_type=fstype,
> - mountpoint=mountpoint,
> - grow=grow,
> - maxsize=maxsize,
> - size=size)
> + mountpoint=request.mountpoint,
> + grow=request.grow,
> + maxsize=request.maxSize,
> + size=request.size)
>
> # schedule the device for creation
> anaconda.id.storage.createDevice(dev)
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
