From: mulhern amulhern@redhat.com

Resolves: rhbz#1139222

Previously, if a device had a child that was a LUKS device that child was ignored when generating ksdata. What this meant was that that device's format, which was luks, was used in generating the kickstart data.

Now, the LUKSDevice, which contains the format that should appear in the ks output is used. This means that the LUKS format is used to set some ks data, but the mountpoint and so forth are overwritten with the correct values when the format on the LUKSDevice is used to populate those values.

The --passphrase option with passphrase continues to not appear in the output anaconda-ks.cfg file.

Signed-off-by: mulhern amulhern@redhat.com --- blivet/__init__.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py index 42a37f6..686dc5d 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -72,7 +72,7 @@ def cb(self, exn):

from .storage_log import log_exception_info, log_method_call from .errors import DeviceError, DirtyFSError, FSResizeError, FSTabTypeMismatchError, LUKSDeviceWithoutKeyError, UnknownSourceDeviceError, SanityError, SanityWarning, StorageError, UnrecognizedFSTabEntryError -from .devices import BTRFSDevice, BTRFSSubVolumeDevice, BTRFSVolumeDevice, DirectoryDevice, FileDevice, LVMLogicalVolumeDevice, LVMThinLogicalVolumeDevice, LVMThinPoolDevice, LVMVolumeGroupDevice, MDRaidArrayDevice, NetworkStorageDevice, NFSDevice, NoDevice, OpticalDevice, PartitionDevice, TmpFSDevice, devicePathToName +from .devices import BTRFSDevice, BTRFSSubVolumeDevice, BTRFSVolumeDevice, DirectoryDevice, FileDevice, LUKSDevice, LVMLogicalVolumeDevice, LVMThinLogicalVolumeDevice, LVMThinPoolDevice, LVMVolumeGroupDevice, MDRaidArrayDevice, NetworkStorageDevice, NFSDevice, NoDevice, OpticalDevice, PartitionDevice, TmpFSDevice, devicePathToName from .devicetree import DeviceTree from .deviceaction import ActionCreateDevice, ActionCreateFormat, ActionDestroyDevice, ActionDestroyFormat, ActionResizeDevice, ActionResizeFormat from .formats import getFormat @@ -2147,6 +2147,11 @@ def updateKSData(self): if self.doAutoPart: return

+ self._updateCustomStorageKSData() + + def _updateCustomStorageKSData(self): + """ Update KSData for custom storage. """ + # custom storage ksMap = {PartitionDevice: ("PartData", "partition"), TmpFSDevice: ("PartData", "partition"), @@ -2158,6 +2163,10 @@ def updateKSData(self): # make a list of ancestors of all used devices devices = list(set(a for d in list(self.mountpoints.values()) + self.swaps for a in d.ancestors)) + + # devices which share information with their distinct raw device + complementary_devices = [d for d in devices if d.raw_device is not d] + devices.sort(key=lambda d: len(d.ancestors)) for device in devices: cls = next((c for c in ksMap if isinstance(device, c)), None) @@ -2170,6 +2179,10 @@ def updateKSData(self): cls = getattr(self.ksdata, class_attr) data = cls() # all defaults

+ # if this is the raw device of a complementary device use the + # complementary device instead. + device = next((d for d in complementary_devices if d.raw_device is device), device) + device.populateKSData(data)

parent = getattr(self.ksdata, list_attr)

@@ -2170,6 +2179,10 @@ def updateKSData(self): cls = getattr(self.ksdata, class_attr) data = cls() # all defaults

•        # if this is the raw device of a complementary device use the
  

•        # complementary device instead.
  

•        device = next((d for d in complementary_devices if d.raw_device is device), device)
  

I'd prefer here a list comprehension assigned to a properly named variable with an ``if`` instead of the combinatio of ``next()`` and a generator. If would be much better readable to me and better matching the comment above it.