25 changed files with 1969 additions and 2941 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/blivet-3.4.0-tests.tar.gz
-SOURCES/blivet-3.4.0.tar.gz
+SOURCES/blivet-3.6.0-tests.tar.gz
+SOURCES/blivet-3.6.0.tar.gz
--- a/.python-blivet.metadata
+++ b/.python-blivet.metadata
@ -1,2 +0,0 @@
-d0a86df7bbaeda7be9990b7f7b15ec36b325ec7a SOURCES/blivet-3.4.0-tests.tar.gz
-aafc429e224dfd204cb1c284bb70de52920f7b20 SOURCES/blivet-3.4.0.tar.gz
--- a/SOURCES/0001-force-lvm-cli.plugin
+++ b/SOURCES/0001-force-lvm-cli.plugin
@ -1,4 +1,4 @@
-From 2f90040ff66eacc9715e370cd49ffb72d8d1f36f Mon Sep 17 00:00:00 2001
+From 83ccc9f9f14845fcce7a5ba5fa21fbb97b1dbbb7 Mon Sep 17 00:00:00 2001
 From: Vojtech Trefny <vtrefny@redhat.com>
 Date: Wed, 11 Jul 2018 15:36:24 +0200
 Subject: [PATCH] Force command line based libblockdev LVM plugin
@ -8,7 +8,7 @@ Subject: [PATCH] Force command line based libblockdev LVM plugin
 1 file changed, 7 insertions(+), 2 deletions(-)

 diff --git a/blivet/__init__.py b/blivet/__init__.py
-index c5a75bb..cb75917 100644
+index dd8d0f54..62cc539a 100644
 --- a/blivet/__init__.py
 +++ b/blivet/__init__.py
@@ -63,11 +63,16 @@ gi.require_version("BlockDev", "2.0")
@ -31,5 +31,5 @@ index c5a75bb..cb75917 100644
     # do not check for dependencies during libblockdev initializtion, do runtime
     # checks instead
 -- 
-1.8.3.1
+2.38.1

--- a/SOURCES/0002-remove-btrfs-plugin.patch
+++ b/SOURCES/0002-remove-btrfs-plugin.patch
@ -1,4 +1,4 @@
-From 6bf3378d3d2a1b6a4338df0c4dd36a783a641633 Mon Sep 17 00:00:00 2001
+From c098d4112635b3ea55d5bd7e1817edbd519735fc Mon Sep 17 00:00:00 2001
 From: Vojtech Trefny <vtrefny@redhat.com>
 Date: Mon, 16 Jul 2018 14:26:11 +0200
 Subject: [PATCH] Remove btrfs from requested libblockdev plugins
@ -8,7 +8,7 @@ Subject: [PATCH] Remove btrfs from requested libblockdev plugins
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/blivet/__init__.py b/blivet/__init__.py
-index cb75917..09f8b1c 100644
+index 62cc539a..bbc7ea3a 100644
 --- a/blivet/__init__.py
 +++ b/blivet/__init__.py
@@ -63,9 +63,9 @@ gi.require_version("BlockDev", "2.0")
@ -24,5 +24,5 @@ index cb75917..09f8b1c 100644
 _requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES)
 # XXX force non-dbus LVM plugin
 -- 
-1.8.3.1
+2.38.1

--- a/SOURCES/0003-Revert-More-consistent-lvm-errors.patch
+++ b/SOURCES/0003-Revert-More-consistent-lvm-errors.patch
@ -1,19 +1,19 @@
-From 3a42d9e2afdf04dbbfd2c507f5b2392193fda25b Mon Sep 17 00:00:00 2001
+From f6f90805020d7c6ac46f17a13a00f319fc4351f6 Mon Sep 17 00:00:00 2001
 From: Vojtech Trefny <vtrefny@redhat.com>
 Date: Wed, 26 May 2021 12:15:54 +0200
 Subject: [PATCH] Revert "More consistent lvm errors (API break)"

 This reverts commit 49ec071c6d0673224a0774d613904387c52c7381.
 ---
- blivet/devices/lvm.py          | 72 +++++++++++++++++-----------------
- tests/devices_test/lvm_test.py | 14 +++----
+ blivet/devices/lvm.py                     | 72 +++++++++++------------
+ tests/unit_tests/devices_test/lvm_test.py | 14 ++---
 2 files changed, 43 insertions(+), 43 deletions(-)

 diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
-index a55515fc..6d23bfba 100644
+index 38e49e18..b8595d63 100644
 --- a/blivet/devices/lvm.py
 +++ b/blivet/devices/lvm.py
-@@ -307,7 +307,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
+@@ -304,7 +304,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
     def _add_log_vol(self, lv):
         """ Add an LV to this VG. """
         if lv in self._lvs:
@ -22,7 +22,7 @@ index a55515fc..6d23bfba 100644
 
         # verify we have the space, then add it
         # do not verify for growing vg (because of ks)
-@@ -340,7 +340,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
+@@ -337,7 +337,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
     def _remove_log_vol(self, lv):
         """ Remove an LV from this VG. """
         if lv not in self.lvs:
@ -31,7 +31,7 @@ index a55515fc..6d23bfba 100644
 
         self._lvs.remove(lv)
 
-@@ -415,7 +415,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
+@@ -430,7 +430,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
     @thpool_reserve.setter
     def thpool_reserve(self, value):
         if value is not None and not isinstance(value, ThPoolReserveSpec):
@ -40,8 +40,8 @@ index a55515fc..6d23bfba 100644
         self._thpool_reserve = value
 
     @property
-@@ -646,14 +646,14 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
-             if seg_type not in [None, "linear", "thin", "thin-pool", "cache", "vdo-pool", "vdo"] + lvm.raid_seg_types:
+@@ -665,14 +665,14 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+             if seg_type not in [None, "linear", "thin", "thin-pool", "cache", "vdo-pool", "vdo", "cache-pool"] + lvm.raid_seg_types:
                 raise ValueError("Invalid or unsupported segment type: %s" % seg_type)
             if seg_type and seg_type in lvm.raid_seg_types and not pvs:
 -                raise errors.DeviceError("List of PVs has to be given for every non-linear LV")
@ -60,7 +60,7 @@ index a55515fc..6d23bfba 100644
 
         # When this device's format is set in the superclass constructor it will
         # try to access self.snapshots.
-@@ -702,13 +702,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+@@ -721,13 +721,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
         self._from_lvs = from_lvs
         if self._from_lvs:
             if exists:
@ -78,7 +78,7 @@ index a55515fc..6d23bfba 100644
 
         self._cache = None
         if cache_request and not self.exists:
-@@ -723,13 +723,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+@@ -746,13 +746,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
             elif isinstance(pv_spec, StorageDevice):
                 self._pv_specs.append(LVPVSpec(pv_spec, Size(0)))
             else:
@ -94,7 +94,7 @@ index a55515fc..6d23bfba 100644
         if self._pv_specs:
             self._assign_pv_space()
 
-@@ -1072,7 +1072,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+@@ -1130,7 +1130,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
         else:
             msg = "the specified internal LV '%s' doesn't belong to this LV ('%s')" % (int_lv.lv_name,
                                                                                        self.name)
@ -103,7 +103,7 @@ index a55515fc..6d23bfba 100644
 
     def populate_ksdata(self, data):
         super(LVMLogicalVolumeBase, self).populate_ksdata(data)
-@@ -1171,7 +1171,7 @@ class LVMInternalLogicalVolumeMixin(object):
+@@ -1229,7 +1229,7 @@ class LVMInternalLogicalVolumeMixin(object):
     def _init_check(self):
         # an internal LV should have no parents
         if self._parent_lv and self._parents:
@ -112,7 +112,7 @@ index a55515fc..6d23bfba 100644
 
     @property
     def is_internal_lv(self):
-@@ -1231,7 +1231,7 @@ class LVMInternalLogicalVolumeMixin(object):
+@@ -1289,7 +1289,7 @@ class LVMInternalLogicalVolumeMixin(object):
 
     @readonly.setter
     def readonly(self, value):  # pylint: disable=unused-argument
@ -121,7 +121,7 @@ index a55515fc..6d23bfba 100644
 
     @property
     def type(self):
-@@ -1267,7 +1267,7 @@ class LVMInternalLogicalVolumeMixin(object):
+@@ -1325,7 +1325,7 @@ class LVMInternalLogicalVolumeMixin(object):
     def _check_parents(self):
         # an internal LV should have no parents
         if self._parents:
@ -130,7 +130,7 @@ index a55515fc..6d23bfba 100644
 
     def _add_to_parents(self):
         # nothing to do here, an internal LV has no parents (in the DeviceTree's
-@@ -1277,13 +1277,13 @@ class LVMInternalLogicalVolumeMixin(object):
+@@ -1335,13 +1335,13 @@ class LVMInternalLogicalVolumeMixin(object):
     # internal LVs follow different rules limitting size
     def _set_size(self, newsize):
         if not isinstance(newsize, Size):
@ -146,7 +146,7 @@ index a55515fc..6d23bfba 100644
         else:
             # same rules apply as for any other LV
             raise NotTypeSpecific()
-@@ -1361,18 +1361,18 @@ class LVMSnapshotMixin(object):
+@@ -1419,18 +1419,18 @@ class LVMSnapshotMixin(object):
             return
 
         if self.origin and not isinstance(self.origin, LVMLogicalVolumeDevice):
@ -169,7 +169,7 @@ index a55515fc..6d23bfba 100644
 
     @property
     def is_snapshot_lv(self):
-@@ -1544,7 +1544,7 @@ class LVMThinPoolMixin(object):
+@@ -1606,7 +1606,7 @@ class LVMThinPoolMixin(object):
     def _check_from_lvs(self):
         if self._from_lvs:
             if len(self._from_lvs) != 2:
@ -178,7 +178,7 @@ index a55515fc..6d23bfba 100644
 
     def _convert_from_lvs(self):
         data_lv, metadata_lv = self._from_lvs
-@@ -1590,7 +1590,7 @@ class LVMThinPoolMixin(object):
+@@ -1652,7 +1652,7 @@ class LVMThinPoolMixin(object):
     def _add_log_vol(self, lv):
         """ Add an LV to this pool. """
         if lv in self._lvs:
@ -187,7 +187,7 @@ index a55515fc..6d23bfba 100644
 
         # TODO: add some checking to prevent overcommit for preexisting
         self.vg._add_log_vol(lv)
-@@ -1601,7 +1601,7 @@ class LVMThinPoolMixin(object):
+@@ -1663,7 +1663,7 @@ class LVMThinPoolMixin(object):
     def _remove_log_vol(self, lv):
         """ Remove an LV from this pool. """
         if lv not in self._lvs:
@ -196,7 +196,7 @@ index a55515fc..6d23bfba 100644
 
         self._lvs.remove(lv)
         self.vg._remove_log_vol(lv)
-@@ -1711,14 +1711,14 @@ class LVMThinLogicalVolumeMixin(object):
+@@ -1772,14 +1772,14 @@ class LVMThinLogicalVolumeMixin(object):
         """Check that this device has parents as expected"""
         if isinstance(self.parents, (list, ParentList)):
             if len(self.parents) != 1:
@ -213,7 +213,7 @@ index a55515fc..6d23bfba 100644
 
     @property
     def is_thin_lv(self):
-@@ -1755,7 +1755,7 @@ class LVMThinLogicalVolumeMixin(object):
+@@ -1816,7 +1816,7 @@ class LVMThinLogicalVolumeMixin(object):
 
     def _set_size(self, newsize):
         if not isinstance(newsize, Size):
@ -222,7 +222,7 @@ index a55515fc..6d23bfba 100644
 
         newsize = self.vg.align(newsize)
         newsize = self.vg.align(util.numeric_type(newsize))
-@@ -2229,7 +2229,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+@@ -2499,7 +2499,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
             container = self.parents
 
         if not isinstance(container, LVMVolumeGroupDevice):
@ -231,7 +231,7 @@ index a55515fc..6d23bfba 100644
 
     @type_specific
     def _add_to_parents(self):
-@@ -2240,12 +2240,12 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+@@ -2510,12 +2510,12 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
     @type_specific
     def _check_from_lvs(self):
         """Check the LVs to create this LV from"""
@ -246,7 +246,7 @@ index a55515fc..6d23bfba 100644
 
     @property
     def external_dependencies(self):
-@@ -2265,7 +2265,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+@@ -2535,7 +2535,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
     @type_specific
     def _set_size(self, newsize):
         if not isinstance(newsize, Size):
@ -255,7 +255,7 @@ index a55515fc..6d23bfba 100644
 
         newsize = self.vg.align(newsize)
         log.debug("trying to set lv %s size to %s", self.name, newsize)
-@@ -2274,7 +2274,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+@@ -2544,7 +2544,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
         # space for it. A similar reasoning applies to shrinking the LV.
         if not self.exists and newsize > self.size and newsize > self.vg.free_space + self.vg_space_used:
             log.error("failed to set size: %s short", newsize - (self.vg.free_space + self.vg_space_used))
@ -264,7 +264,7 @@ index a55515fc..6d23bfba 100644
 
         LVMLogicalVolumeBase._set_size(self, newsize)
 
-@@ -2622,7 +2622,7 @@ class LVMCache(Cache):
+@@ -2910,7 +2910,7 @@ class LVMCache(Cache):
                 spec.size = spec.pv.format.free
                 space_to_assign -= spec.pv.format.free
         if space_to_assign > 0:
@ -273,11 +273,11 @@ index a55515fc..6d23bfba 100644
 
     @property
     def size(self):
-diff --git a/tests/devices_test/lvm_test.py b/tests/devices_test/lvm_test.py
-index 670c91c9..4156d0bf 100644
--- a/tests/devices_test/lvm_test.py
-+++ b/tests/devices_test/lvm_test.py
-@@ -36,10 +36,10 @@ class LVMDeviceTest(unittest.TestCase):
+diff --git a/tests/unit_tests/devices_test/lvm_test.py b/tests/unit_tests/devices_test/lvm_test.py
+index 47613fdc..995c2da4 100644
+--- a/tests/unit_tests/devices_test/lvm_test.py
+++ b/tests/unit_tests/devices_test/lvm_test.py
+@@ -32,10 +32,10 @@ class LVMDeviceTest(unittest.TestCase):
         lv = LVMLogicalVolumeDevice("testlv", parents=[vg],
                                     fmt=blivet.formats.get_format("xfs"))
 
@ -290,7 +290,7 @@ index 670c91c9..4156d0bf 100644
             LVMLogicalVolumeDevice("snap1", parents=[vg], vorigin=True)
 
         lv.exists = True
-@@ -64,7 +64,7 @@ class LVMDeviceTest(unittest.TestCase):
+@@ -60,7 +60,7 @@ class LVMDeviceTest(unittest.TestCase):
         pool = LVMLogicalVolumeDevice("pool1", parents=[vg], size=Size("500 MiB"), seg_type="thin-pool")
         thinlv = LVMLogicalVolumeDevice("thinlv", parents=[pool], size=Size("200 MiB"), seg_type="thin")
 
@ -299,7 +299,7 @@ index 670c91c9..4156d0bf 100644
             LVMLogicalVolumeDevice("snap1", parents=[pool], origin=pv, seg_type="thin")
 
         # now make the constructor succeed so we can test some properties
-@@ -258,21 +258,21 @@ class LVMDeviceTest(unittest.TestCase):
+@@ -310,21 +310,21 @@ class LVMDeviceTest(unittest.TestCase):
         vg = LVMVolumeGroupDevice("testvg", parents=[pv, pv2])
 
         # pvs have to be specified for non-linear LVs
@ -326,5 +326,5 @@ index 670c91c9..4156d0bf 100644
             pv_spec2 = LVPVSpec(pv2, Size("250 MiB"))
             lv = LVMLogicalVolumeDevice("testlv", parents=[vg], size=Size("512 MiB"),
 -- 
-2.31.1
+2.38.1

--- a/SOURCES/0004-Revert-Terminology-cleanups.patch
+++ b/SOURCES/0004-Revert-Terminology-cleanups.patch
@ -1,4 +1,4 @@
-From 42042e7fb6177d3cfe5568e358a38278925a2624 Mon Sep 17 00:00:00 2001
+From d8a8d96450bf0d3458671b9b7d23d972aa540396 Mon Sep 17 00:00:00 2001
 From: Vojtech Trefny <vtrefny@redhat.com>
 Date: Wed, 26 May 2021 12:27:34 +0200
 Subject: [PATCH] Revert "Terminology cleanups"
@ -8,32 +8,32 @@ This reverts following commits:
 - 63c9c7165e5cdfa4a47dcf0ed9d717b71e7921f2
 - 8956b9af8a785ae25e0e7153d2ef0702ce2f567c
 ---
- blivet/devicefactory.py               | 24 +++++-----
- blivet/devices/dm.py                  |  9 +++-
- blivet/devices/loop.py                | 20 ++++----
- blivet/devices/luks.py                | 26 +++++-----
- blivet/errors.py                      |  2 +-
- blivet/partitioning.py                | 22 +++++++--
- blivet/populator/helpers/dm.py        |  4 +-
- blivet/populator/helpers/luks.py      |  4 +-
- blivet/populator/helpers/lvm.py       |  2 +-
- blivet/populator/helpers/mdraid.py    | 14 +++---
- blivet/populator/helpers/multipath.py |  8 ++--
- blivet/populator/populator.py         | 69 ++++++++++++++-------------
- blivet/threads.py                     |  3 +-
- blivet/udev.py                        | 34 ++++++-------
- tests/devicefactory_test.py           | 10 ++--
- tests/devices_test/size_test.py       |  6 +--
- tests/populator_test.py               | 34 ++++++-------
- tests/udev_test.py                    | 12 ++---
- tests/vmtests/vmbackedtestcase.py     |  2 +-
- 19 files changed, 168 insertions(+), 137 deletions(-)
+ blivet/devicefactory.py                       | 24 +++----
+ blivet/devices/dm.py                          |  9 ++-
+ blivet/devices/loop.py                        | 20 +++---
+ blivet/devices/luks.py                        | 26 ++++---
+ blivet/errors.py                              |  2 +-
+ blivet/partitioning.py                        | 22 +++++-
+ blivet/populator/helpers/dm.py                |  4 +-
+ blivet/populator/helpers/luks.py              |  4 +-
+ blivet/populator/helpers/lvm.py               |  2 +-
+ blivet/populator/helpers/mdraid.py            | 14 ++--
+ blivet/populator/helpers/multipath.py         |  8 +--
+ blivet/populator/populator.py                 | 67 ++++++++++---------
+ blivet/threads.py                             |  3 +-
+ blivet/udev.py                                | 34 +++++-----
+ tests/unit_tests/devicefactory_test.py        | 10 +--
+ .../devices_test/device_size_test.py          |  6 +-
+ tests/unit_tests/populator_test.py            | 34 +++++-----
+ tests/unit_tests/udev_test.py                 | 12 ++--
+ tests/vmtests/vmbackedtestcase.py             |  2 +-
+ 19 files changed, 167 insertions(+), 136 deletions(-)

 diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
-index 0f7fdfa1..f56bd9a3 100644
+index 6f460f6d..90082c28 100644
 --- a/blivet/devicefactory.py
 +++ b/blivet/devicefactory.py
-@@ -849,12 +849,12 @@ class DeviceFactory(object):
+@@ -859,12 +859,12 @@ class DeviceFactory(object):
                 parent_container.parents.remove(orig_device)
 
         if self.encrypted and isinstance(self.device, LUKSDevice) and \
@ -50,7 +50,7 @@ index 0f7fdfa1..f56bd9a3 100644
 
     def _set_name(self):
         if not self.device_name:
-@@ -1173,11 +1173,11 @@ class PartitionSetFactory(PartitionFactory):
+@@ -1201,11 +1201,11 @@ class PartitionSetFactory(PartitionFactory):
                     container.parents.remove(member)
                 self.storage.destroy_device(member)
                 members.remove(member)
@ -65,7 +65,7 @@ index 0f7fdfa1..f56bd9a3 100644
 
                 continue
 
-@@ -1199,10 +1199,10 @@ class PartitionSetFactory(PartitionFactory):
+@@ -1227,10 +1227,10 @@ class PartitionSetFactory(PartitionFactory):
 
                 continue
 
@ -80,7 +80,7 @@ index 0f7fdfa1..f56bd9a3 100644
 
         ##
         # Prepare previously allocated member partitions for reallocation.
-@@ -1262,7 +1262,7 @@ class PartitionSetFactory(PartitionFactory):
+@@ -1290,7 +1290,7 @@ class PartitionSetFactory(PartitionFactory):
 
             if isinstance(member, LUKSDevice):
                 self.storage.destroy_device(member)
@ -90,7 +90,7 @@ index 0f7fdfa1..f56bd9a3 100644
             self.storage.destroy_device(member)
 
 diff --git a/blivet/devices/dm.py b/blivet/devices/dm.py
-index 3529f61c..508a6f89 100644
+index 2f936170..ae25e8e6 100644
 --- a/blivet/devices/dm.py
 +++ b/blivet/devices/dm.py
@@ -154,6 +154,11 @@ class DMDevice(StorageDevice):
@ -178,7 +178,7 @@ index 0f4d7775..78f88d7d 100644
 +    def slave(self):
 +        return self.parents[0]
 diff --git a/blivet/devices/luks.py b/blivet/devices/luks.py
-index 5d6d6c65..555f1acd 100644
+index 2eb1f130..5ab840ea 100644
 --- a/blivet/devices/luks.py
 +++ b/blivet/devices/luks.py
@@ -66,13 +66,17 @@ class LUKSDevice(DMCryptDevice):
@ -270,10 +270,10 @@ index 5d6d6c65..555f1acd 100644
         super(LUKSDevice, self).populate_ksdata(data)
 
 diff --git a/blivet/errors.py b/blivet/errors.py
-index fd51283f..f6bf853a 100644
+index b886ffec..30c9921a 100644
 --- a/blivet/errors.py
 +++ b/blivet/errors.py
-@@ -192,7 +192,7 @@ class DeviceTreeError(StorageError):
+@@ -201,7 +201,7 @@ class DeviceTreeError(StorageError):
     pass
 
 
@ -283,7 +283,7 @@ index fd51283f..f6bf853a 100644
 
 
 diff --git a/blivet/partitioning.py b/blivet/partitioning.py
-index 53f9cc3f..ca0a55d1 100644
+index ce77e4eb..2cd6554c 100644
 --- a/blivet/partitioning.py
 +++ b/blivet/partitioning.py
@@ -32,7 +32,7 @@ import _ped
@ -295,7 +295,7 @@ index 53f9cc3f..ca0a55d1 100644
 from .size import Size
 from .i18n import _
 from .util import stringize, unicodeize, compare
-@@ -1632,7 +1632,15 @@ class TotalSizeSet(object):
+@@ -1635,7 +1635,15 @@ class TotalSizeSet(object):
             :param size: the target combined size
             :type size: :class:`~.size.Size`
         """
@ -312,7 +312,7 @@ index 53f9cc3f..ca0a55d1 100644
         self.size = size
 
         self.requests = []
-@@ -1670,7 +1678,15 @@ class SameSizeSet(object):
+@@ -1673,7 +1681,15 @@ class SameSizeSet(object):
             :keyword max_size: the maximum size for growable devices
             :type max_size: :class:`~.size.Size`
         """
@ -330,10 +330,10 @@ index 53f9cc3f..ca0a55d1 100644
         self.grow = grow
         self.max_size = max_size
 diff --git a/blivet/populator/helpers/dm.py b/blivet/populator/helpers/dm.py
-index 30e99aa1..770736b0 100644
+index 4721390e..0ad065e2 100644
 --- a/blivet/populator/helpers/dm.py
 +++ b/blivet/populator/helpers/dm.py
-@@ -46,13 +46,13 @@ class DMDevicePopulator(DevicePopulator):
+@@ -47,13 +47,13 @@ class DMDevicePopulator(DevicePopulator):
         name = udev.device_get_name(self.data)
         log_method_call(self, name=name)
         sysfs_path = udev.device_get_sysfs_path(self.data)
@ -350,7 +350,7 @@ index 30e99aa1..770736b0 100644
             device.controllable = False
             self._devicetree._add_device(device)
 diff --git a/blivet/populator/helpers/luks.py b/blivet/populator/helpers/luks.py
-index 52795a98..51488691 100644
+index 3221122a..9b5023f8 100644
 --- a/blivet/populator/helpers/luks.py
 +++ b/blivet/populator/helpers/luks.py
@@ -43,7 +43,7 @@ class LUKSDevicePopulator(DevicePopulator):
@ -368,14 +368,14 @@ index 52795a98..51488691 100644
     def run(self):
 -        parents = self._devicetree._add_parent_devices(self.data)
 +        parents = self._devicetree._add_slave_devices(self.data)
-         device = IntegrityDevice(udev.device_get_name(self.data),
-                                  sysfs_path=udev.device_get_sysfs_path(self.data),
-                                  parents=parents,
+         name = udev.device_get_name(self.data)
+ 
+         try:
 diff --git a/blivet/populator/helpers/lvm.py b/blivet/populator/helpers/lvm.py
-index c7adfa4e..b1626306 100644
+index 6ef2f417..b549e8d3 100644
 --- a/blivet/populator/helpers/lvm.py
 +++ b/blivet/populator/helpers/lvm.py
-@@ -57,7 +57,7 @@ class LVMDevicePopulator(DevicePopulator):
+@@ -58,7 +58,7 @@ class LVMDevicePopulator(DevicePopulator):
             log.warning("found non-vg device with name %s", vg_name)
             device = None
 
@ -385,7 +385,7 @@ index c7adfa4e..b1626306 100644
         # LVM provides no means to resolve conflicts caused by duplicated VG
         # names, so we're just being optimistic here. Woo!
 diff --git a/blivet/populator/helpers/mdraid.py b/blivet/populator/helpers/mdraid.py
-index 3479e3f7..76aebf25 100644
+index a7602d20..9bec11ef 100644
 --- a/blivet/populator/helpers/mdraid.py
 +++ b/blivet/populator/helpers/mdraid.py
@@ -31,7 +31,7 @@ from ... import udev
@ -448,7 +448,7 @@ index 96c0a9ad..10c745bf 100644
 
         return device
 diff --git a/blivet/populator/populator.py b/blivet/populator/populator.py
-index 75bb1741..d252281d 100644
+index 3a419418..068270b2 100644
 --- a/blivet/populator/populator.py
 +++ b/blivet/populator/populator.py
@@ -31,7 +31,7 @@ gi.require_version("BlockDev", "2.0")
@ -549,17 +549,8 @@ index 75bb1741..d252281d 100644
 
     def _add_name(self, name):
         if name not in self.names:
-@@ -317,7 +318,7 @@ class PopulatorMixin(object):
-                 continue
- 
-             # Make sure lvm doesn't get confused by PVs that belong to
-            # incomplete VGs. We will remove the PVs from the reject list when/if
-+            # incomplete VGs. We will remove the PVs from the blacklist when/if
-             # the time comes to remove the incomplete VG and its PVs.
-             for pv in vg.pvs:
-                 lvm.lvm_cc_addFilterRejectRegexp(pv.name)
 diff --git a/blivet/threads.py b/blivet/threads.py
-index 7e6d3105..a70deb69 100644
+index 5e2dff3f..1a5cc6db 100644
 --- a/blivet/threads.py
 +++ b/blivet/threads.py
@@ -63,11 +63,12 @@ class SynchronizedMeta(type):
@ -577,7 +568,7 @@ index 7e6d3105..a70deb69 100644
             elif isinstance(obj, FunctionType):
                 obj = exclusive(obj)
 diff --git a/blivet/udev.py b/blivet/udev.py
-index a8297f3f..e1b67845 100644
+index efbc53d6..ddc49a37 100644
 --- a/blivet/udev.py
 +++ b/blivet/udev.py
@@ -39,7 +39,7 @@ from gi.repository import BlockDev as blockdev
@ -615,16 +606,16 @@ index a8297f3f..e1b67845 100644
             return True
 
     dev_path = "/sys/class/block/%s" % dev_name
-@@ -374,7 +374,7 @@ def device_is_disk(info):
-                  device_is_dm_lvm(info) or
+@@ -375,7 +375,7 @@ def device_is_disk(info):
                  device_is_dm_crypt(info) or
+                  device_is_dm_stratis(info) or
                  (device_is_md(info) and
 -                  (not device_get_md_container(info) and not all(device_is_disk(d) for d in device_get_parents(info))))))
 +                  (not device_get_md_container(info) and not all(device_is_disk(d) for d in device_get_slaves(info))))))
 
 
 def device_is_partition(info):
-@@ -453,18 +453,18 @@ def device_get_devname(info):
+@@ -454,18 +454,18 @@ def device_get_devname(info):
     return info.get('DEVNAME')
 
 
@ -651,7 +642,7 @@ index a8297f3f..e1b67845 100644
 
 
 def device_get_holders(info):
-@@ -736,7 +736,7 @@ def device_get_partition_disk(info):
+@@ -742,7 +742,7 @@ def device_get_partition_disk(info):
     disk = None
     majorminor = info.get("ID_PART_ENTRY_DISK")
     sysfs_path = device_get_sysfs_path(info)
@ -660,7 +651,7 @@ index a8297f3f..e1b67845 100644
     if majorminor:
         major, minor = majorminor.split(":")
         for device in get_devices():
-@@ -744,8 +744,8 @@ def device_get_partition_disk(info):
+@@ -750,8 +750,8 @@ def device_get_partition_disk(info):
                 disk = device_get_name(device)
                 break
     elif device_is_dm_partition(info):
@ -671,11 +662,11 @@ index a8297f3f..e1b67845 100644
             if len(parents) == 1:
                 disk = resolve_devspec(parents[0].replace('!', '/'))
     else:
-diff --git a/tests/devicefactory_test.py b/tests/devicefactory_test.py
-index dc0d6408..dfd78a7a 100644
--- a/tests/devicefactory_test.py
-+++ b/tests/devicefactory_test.py
-@@ -112,9 +112,9 @@ class DeviceFactoryTestCase(unittest.TestCase):
+diff --git a/tests/unit_tests/devicefactory_test.py b/tests/unit_tests/devicefactory_test.py
+index ff6bcb9e..552aadc1 100644
+--- a/tests/unit_tests/devicefactory_test.py
+++ b/tests/unit_tests/devicefactory_test.py
+@@ -115,9 +115,9 @@ class DeviceFactoryTestCase(unittest.TestCase):
                          kwargs.get("encrypted", False) or
                          kwargs.get("container_encrypted", False))
         if kwargs.get("encrypted", False):
@ -687,7 +678,7 @@ index dc0d6408..dfd78a7a 100644
                              kwargs.get("luks_sector_size", 0))
 
         self.assertTrue(set(device.disks).issubset(kwargs["disks"]))
-@@ -354,7 +354,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
+@@ -357,7 +357,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
         device = args[0]
 
         if kwargs.get("encrypted"):
@ -696,7 +687,7 @@ index dc0d6408..dfd78a7a 100644
         else:
             container = device.container
 
-@@ -373,7 +373,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
+@@ -376,7 +376,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
             self.assertIsInstance(pv, member_class)
 
             if pv.encrypted:
@ -705,7 +696,7 @@ index dc0d6408..dfd78a7a 100644
                                  kwargs.get("luks_version", crypto.DEFAULT_LUKS_VERSION))
 
     @patch("blivet.formats.lvmpv.LVMPhysicalVolume.formattable", return_value=True)
-@@ -589,7 +589,7 @@ class LVMThinPFactoryTestCase(LVMFactoryTestCase):
+@@ -592,7 +592,7 @@ class LVMThinPFactoryTestCase(LVMFactoryTestCase):
         device = args[0]
 
         if kwargs.get("encrypted", False):
@ -714,10 +705,10 @@ index dc0d6408..dfd78a7a 100644
         else:
             thinlv = device
 
-diff --git a/tests/devices_test/size_test.py b/tests/devices_test/size_test.py
+diff --git a/tests/unit_tests/devices_test/device_size_test.py b/tests/unit_tests/devices_test/device_size_test.py
 index d0c0a3f4..a1efa86d 100644
--- a/tests/devices_test/size_test.py
-+++ b/tests/devices_test/size_test.py
+--- a/tests/unit_tests/devices_test/device_size_test.py
+++ b/tests/unit_tests/devices_test/device_size_test.py
@@ -107,8 +107,8 @@ class LUKSDeviceSizeTest(StorageDeviceSizeTest):
 
     def _get_device(self, *args, **kwargs):
@ -735,11 +726,11 @@ index d0c0a3f4..a1efa86d 100644
         self.assertEqual(dev.size, initial_size)
 -        self.assertEqual(dev.raw_device.size, initial_size + crypto.LUKS_METADATA_SIZE)
 +        self.assertEqual(dev.slave.size, initial_size + crypto.LUKS_METADATA_SIZE)
-diff --git a/tests/populator_test.py b/tests/populator_test.py
-index a7748a9d..531ec74b 100644
--- a/tests/populator_test.py
-+++ b/tests/populator_test.py
-@@ -81,7 +81,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
+diff --git a/tests/unit_tests/populator_test.py b/tests/unit_tests/populator_test.py
+index 369fe878..7ba04bac 100644
+--- a/tests/unit_tests/populator_test.py
+++ b/tests/unit_tests/populator_test.py
+@@ -86,7 +86,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
     @patch.object(DeviceTree, "get_device_by_name")
     @patch.object(DMDevice, "status", return_value=True)
     @patch.object(DMDevice, "update_sysfs_path")
@ -748,7 +739,7 @@ index a7748a9d..531ec74b 100644
     @patch("blivet.udev.device_get_name")
     @patch("blivet.udev.device_get_sysfs_path", return_value=sentinel.sysfs_path)
     def test_run(self, *args):
-@@ -90,7 +90,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -95,7 +95,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
 
         devicetree = DeviceTree()
 
@ -756,17 +747,17 @@ index a7748a9d..531ec74b 100644
 +        # The general case for dm devices is that adding the slave/parent devices
         # will result in the dm device itself being in the tree.
         device = Mock()
-         devicetree.get_device_by_name.return_value = device
-@@ -99,7 +99,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
- 
+         device.id = 0
+@@ -106,7 +106,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
         parent = Mock()
+         parent.id = 0
         parent.parents = []
 -        devicetree._add_parent_devices.return_value = [parent]
 +        devicetree._add_slave_devices.return_value = [parent]
         devicetree._add_device(parent)
         devicetree.get_device_by_name.return_value = None
         device_name = "dmdevice"
-@@ -228,7 +228,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -235,7 +235,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
         # could be the first helper class checked.
 
     @patch.object(DeviceTree, "get_device_by_name")
@ -775,7 +766,7 @@ index a7748a9d..531ec74b 100644
     @patch("blivet.udev.device_get_name")
     @patch("blivet.udev.device_get_lv_vg_name")
     def test_run(self, *args):
-@@ -240,7 +240,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -247,7 +247,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
         devicetree = DeviceTree()
         data = Mock()
 
@ -784,7 +775,7 @@ index a7748a9d..531ec74b 100644
         device_get_name.return_value = sentinel.lv_name
         devicetree.get_device_by_name.return_value = None
 
-@@ -260,7 +260,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -267,7 +267,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
              call(sentinel.vg_name),
              call(sentinel.lv_name)])
 
@ -793,7 +784,7 @@ index a7748a9d..531ec74b 100644
         get_device_by_name.side_effect = None
         get_device_by_name.return_value = None
         self.assertEqual(helper.run(), None)
-@@ -625,7 +625,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -639,7 +639,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
         # could be the first helper class checked.
 
     @patch.object(DeviceTree, "get_device_by_name")
@ -802,7 +793,7 @@ index a7748a9d..531ec74b 100644
     @patch("blivet.udev.device_get_name")
     @patch("blivet.udev.device_get_md_uuid")
     @patch("blivet.udev.device_get_md_name")
-@@ -636,7 +636,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -650,7 +650,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
 
         devicetree = DeviceTree()
 
@ -811,7 +802,7 @@ index a7748a9d..531ec74b 100644
         data = Mock()
         device = Mock()
         device.parents = []
-@@ -699,12 +699,12 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -713,12 +713,12 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
         # could be the first helper class checked.
 
     @patch("blivet.udev.device_get_sysfs_path")
@ -826,20 +817,20 @@ index a7748a9d..531ec74b 100644
 
         devicetree = DeviceTree()
         # set up some fake udev data to verify handling of specific entries
-@@ -719,13 +719,13 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
+@@ -733,13 +733,13 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
 
         device_name = "mpathtest"
         device_get_name.return_value = device_name
-        parent_1 = Mock(tags=set(), wwn=wwn[2:])
+-        parent_1 = Mock(tags=set(), wwn=wwn[2:], id=0)
 -        parent_1.parents = []
-        parent_2 = Mock(tags=set(), wwn=wwn[2:])
+-        parent_2 = Mock(tags=set(), wwn=wwn[2:], id=0)
 -        parent_2.parents = []
 -        devicetree._add_device(parent_1)
 -        devicetree._add_device(parent_2)
 -        add_parent_devices.return_value = [parent_1, parent_2]
-+        slave_1 = Mock(tags=set(), wwn=wwn[2:])
+        slave_1 = Mock(tags=set(), wwn=wwn[2:], id=0)
 +        slave_1.parents = []
-+        slave_2 = Mock(tags=set(), wwn=wwn[2:])
+        slave_2 = Mock(tags=set(), wwn=wwn[2:], id=0)
 +        slave_2.parents = []
 +        devicetree._add_device(slave_1)
 +        devicetree._add_device(slave_2)
@ -847,11 +838,11 @@ index a7748a9d..531ec74b 100644
 
         helper = self.helper_class(devicetree, data)
 
-diff --git a/tests/udev_test.py b/tests/udev_test.py
-index f9b10620..d30a647b 100644
--- a/tests/udev_test.py
-+++ b/tests/udev_test.py
-@@ -45,11 +45,11 @@ class UdevTest(unittest.TestCase):
+diff --git a/tests/unit_tests/udev_test.py b/tests/unit_tests/udev_test.py
+index b208efa8..ebcd59e2 100644
+--- a/tests/unit_tests/udev_test.py
+++ b/tests/unit_tests/udev_test.py
+@@ -49,11 +49,11 @@ class UdevTest(unittest.TestCase):
     @mock.patch('blivet.udev.device_is_dm_crypt', return_value=False)
     @mock.patch('blivet.udev.device_is_md')
     @mock.patch('blivet.udev.device_get_md_container')
@ -865,7 +856,7 @@ index f9b10620..d30a647b 100644
 
         disk_parents = [dict(DEVTYPE="disk", SYS_PATH='/fake/path/2'),
                         dict(DEVTYPE="disk", SYS_PATH='/fake/path/3')]
-@@ -64,20 +64,20 @@ class UdevTest(unittest.TestCase):
+@@ -68,20 +68,20 @@ class UdevTest(unittest.TestCase):
         # Intel FW RAID (MD RAID w/ container layer)
         # device_get_container will return some mock value which will evaluate to True
         device_get_md_container.return_value = mock.sentinel.md_container
@ -904,5 +895,5 @@ index 797bac85..6255104f 100644
         #
         # create disk images
 -- 
-2.31.1
+2.38.1

--- a/SOURCES/0005-DDF-RAID-support-using-mdadm.patch
+++ b/SOURCES/0005-DDF-RAID-support-using-mdadm.patch
@ -0,0 +1,86 @@
+From f6490c469904f4808c63a170210e53acc908b018 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 17 Aug 2022 14:24:21 +0200
+Subject: [PATCH 1/2] Use MD populator instead of DM to handle DDF RAID format
+
+---
+ blivet/formats/dmraid.py | 2 +-
+ blivet/formats/mdraid.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/blivet/formats/dmraid.py b/blivet/formats/dmraid.py
+index 2ba9dcfe..ce15905d 100644
+--- a/blivet/formats/dmraid.py
+++ b/blivet/formats/dmraid.py
+@@ -43,7 +43,7 @@ class DMRaidMember(DeviceFormat):
+     #
+     #     One problem that presents is the possibility of someone passing
+     #     a dmraid member to the MDRaidArrayDevice constructor.
+-    _udev_types = ["adaptec_raid_member", "ddf_raid_member",
+    _udev_types = ["adaptec_raid_member",
+                    "hpt37x_raid_member", "hpt45x_raid_member",
+                    "isw_raid_member",
+                    "jmicron_raid_member", "lsi_mega_raid_member",
+diff --git a/blivet/formats/mdraid.py b/blivet/formats/mdraid.py
+index 41ddef81..4aa3f3b0 100644
+--- a/blivet/formats/mdraid.py
+++ b/blivet/formats/mdraid.py
+@@ -41,7 +41,7 @@ class MDRaidMember(DeviceFormat):
+     """ An mdraid member disk. """
+     _type = "mdmember"
+     _name = N_("software RAID")
+-    _udev_types = ["linux_raid_member"]
+    _udev_types = ["linux_raid_member", "ddf_raid_member"]
+     parted_flag = PARTITION_RAID
+     _formattable = True                 # can be formatted
+     _supported = True                   # is supported
+-- 
+2.38.1
+
+
+From 5fadd850aae217d7692a6c8a50b2dcd5e61a63cd Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 17 Aug 2022 14:24:58 +0200
+Subject: [PATCH 2/2] Do not read DDF RAID UUID from udev
+
+The UUID we get from udev isn't the array UUID, we need to get
+that using libblockdev.
+---
+ blivet/populator/helpers/mdraid.py | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/blivet/populator/helpers/mdraid.py b/blivet/populator/helpers/mdraid.py
+index 3479e3f7..a7602d20 100644
+--- a/blivet/populator/helpers/mdraid.py
+++ b/blivet/populator/helpers/mdraid.py
+@@ -98,17 +98,21 @@ class MDFormatPopulator(FormatPopulator):
+ 
+     def _get_kwargs(self):
+         kwargs = super(MDFormatPopulator, self)._get_kwargs()
+-        try:
+-            # ID_FS_UUID contains the array UUID
+-            kwargs["md_uuid"] = udev.device_get_uuid(self.data)
+-        except KeyError:
+-            log.warning("mdraid member %s has no md uuid", udev.device_get_name(self.data))
+        kwargs["biosraid"] = udev.device_is_biosraid_member(self.data)
+        if not kwargs["biosraid"]:
+            try:
+                # ID_FS_UUID contains the array UUID
+                kwargs["md_uuid"] = udev.device_get_uuid(self.data)
+            except KeyError:
+                log.warning("mdraid member %s has no md uuid", udev.device_get_name(self.data))
+        else:
+            # for BIOS RAIDs we can't get the UUID from udev, we'll get it from mdadm in `run` below
+            kwargs["md_uuid"] = None
+ 
+         # reset the uuid to the member-specific value
+         # this will be None for members of v0 metadata arrays
+         kwargs["uuid"] = udev.device_get_md_device_uuid(self.data)
+ 
+-        kwargs["biosraid"] = udev.device_is_biosraid_member(self.data)
+         return kwargs
+ 
+     def run(self):
+-- 
+2.38.1
+
--- a/SOURCES/0005-Fix-activating-old-style-LVM-snapshots.patch
+++ b/SOURCES/0005-Fix-activating-old-style-LVM-snapshots.patch
@ -1,35 +0,0 @@
-From 8ece3da18b1abb89320d02f4475002e6a3ed7875 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Thu, 20 May 2021 13:40:26 +0200
-Subject: [PATCH] Fix activating old style LVM snapshots
-
-The old style snapshots are activated together with the origin LV
-so we need to make sure it is activated to be able to remove the
-snapshot or its format.
-
-Resolves: rhbz#1961739
---
- blivet/devices/lvm.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
-index a55515fcb..fb57804d9 100644
--- a/blivet/devices/lvm.py
-+++ b/blivet/devices/lvm.py
-@@ -1461,9 +1461,13 @@ def _set_format(self, fmt):  # pylint: disable=unused-argument
-             self._update_format_from_origin()
- 
-     @old_snapshot_specific
-    def setup(self, orig=False):
-        # the old snapshot cannot be setup and torn down
-        pass
-+    def setup(self, orig=False):  # pylint: disable=unused-argument
-+        # the old snapshot is activated together with the origin
-+        if self.origin and not self.origin.status:
-+            try:
-+                self.origin.setup()
-+            except blockdev.LVMError as lvmerr:
-+                log.error("failed to activate origin LV: %s", lvmerr)
- 
-     @old_snapshot_specific
-     def teardown(self, recursive=False):
--- a/SOURCES/0006-Fix-resolving-devices-with-names-that-look-like-BIOS.patch
+++ b/SOURCES/0006-Fix-resolving-devices-with-names-that-look-like-BIOS.patch
@ -1,75 +0,0 @@
-From 344e624f91010b6041c22ee8a24c9305b82af969 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Tue, 18 May 2021 12:54:02 +0200
-Subject: [PATCH] Fix resolving devices with names that look like BIOS drive
- number
-
-A RAID array named "10" will not be resolved because we try to
-resolve it using EDD data and after this lookup fails, we don't
-try the name.
-
-Resolves: rhbz#1960798
---
- blivet/devicetree.py     | 18 +++++++++---------
- tests/devicetree_test.py |  4 ++++
- 2 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/blivet/devicetree.py b/blivet/devicetree.py
-index 88e9f0e5..f4ae1968 100644
--- a/blivet/devicetree.py
-+++ b/blivet/devicetree.py
-@@ -634,20 +634,20 @@ class DeviceTreeBase(object):
-                     (label.startswith("'") and label.endswith("'"))):
-                 label = label[1:-1]
-             device = self.labels.get(label)
-        elif re.match(r'(0x)?[A-Fa-f0-9]{2}(p\d+)?$', devspec):
-            # BIOS drive number
-            (drive, _p, partnum) = devspec.partition("p")
-            spec = int(drive, 16)
-            for (edd_name, edd_number) in self.edd_dict.items():
-                if edd_number == spec:
-                    device = self.get_device_by_name(edd_name + partnum)
-                    break
-         elif options and "nodev" in options.split(","):
-             device = self.get_device_by_name(devspec)
-             if not device:
-                 device = self.get_device_by_path(devspec)
-         else:
-            if not devspec.startswith("/dev/"):
-+            if re.match(r'(0x)?[A-Fa-f0-9]{2}(p\d+)?$', devspec):
-+                # BIOS drive number
-+                (drive, _p, partnum) = devspec.partition("p")
-+                spec = int(drive, 16)
-+                for (edd_name, edd_number) in self.edd_dict.items():
-+                    if edd_number == spec:
-+                        device = self.get_device_by_name(edd_name + partnum)
-+                        break
-+            if not device and not devspec.startswith("/dev/"):
-                 device = self.get_device_by_name(devspec)
-                 if not device:
-                     devspec = "/dev/" + devspec
-diff --git a/tests/devicetree_test.py b/tests/devicetree_test.py
-index 11f8469d..b033343d 100644
--- a/tests/devicetree_test.py
-+++ b/tests/devicetree_test.py
-@@ -49,6 +49,9 @@ class DeviceTreeTestCase(unittest.TestCase):
-         dev3 = StorageDevice("sdp2", exists=True)
-         dt._add_device(dev3)
- 
-+        dev4 = StorageDevice("10", exists=True)
-+        dt._add_device(dev4)
-+
-         dt.edd_dict.update({"dev1": 0x81,
-                             "dev2": 0x82})
- 
-@@ -62,6 +65,7 @@ class DeviceTreeTestCase(unittest.TestCase):
-         self.assertEqual(dt.resolve_device("0x82"), dev2)
- 
-         self.assertEqual(dt.resolve_device(dev3.name), dev3)
-+        self.assertEqual(dt.resolve_device(dev4.name), dev4)
- 
-     def test_device_name(self):
-         # check that devicetree.names property contains all device's names
-- 
-2.31.1
-
--- a/SOURCES/0006-Revert-Remove-the-Blivet.roots-attribute.patch
+++ b/SOURCES/0006-Revert-Remove-the-Blivet.roots-attribute.patch
@ -0,0 +1,77 @@
+From 62af1d7f96b8ed8eb8f2732787576161ae5da79f Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 13 Oct 2022 10:47:52 +0200
+Subject: [PATCH] Revert "Remove the Blivet.roots attribute"
+
+This reverts commit 19a826073345ca6b57a8f9a95ec855892320300e.
+---
+ blivet/blivet.py        | 21 +++++++++++++++++++++
+ blivet/devicefactory.py |  3 +++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/blivet/blivet.py b/blivet/blivet.py
+index bf72ee9c..dc066b03 100644
+--- a/blivet/blivet.py
+++ b/blivet/blivet.py
+@@ -88,6 +88,7 @@ class Blivet(object):
+         self.devicetree = DeviceTree(ignored_disks=self.ignored_disks,
+                                      exclusive_disks=self.exclusive_disks,
+                                      disk_images=self.disk_images)
+        self.roots = []
+ 
+     @property
+     def short_product_name(self):
+@@ -1314,5 +1315,25 @@ class Blivet(object):
+             p = partition.disk.format.parted_disk.getPartitionByPath(partition.path)
+             partition.parted_partition = p
+ 
+        for root in new.roots:
+            root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps]
+            root.swaps = [s for s in root.swaps if s]
+
+            removed = set()
+            for (mountpoint, old_dev) in root.mounts.items():
+                if old_dev is None:
+                    continue
+
+                new_dev = new.devicetree.get_device_by_id(old_dev.id, hidden=True)
+                if new_dev is None:
+                    # if the device has been removed don't include this
+                    # mountpoint at all
+                    removed.add(mountpoint)
+                else:
+                    root.mounts[mountpoint] = new_dev
+
+            for mnt in removed:
+                del root.mounts[mnt]
+
+         log.debug("finished Blivet copy")
+         return new
+diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
+index 8105bfc7..6f460f6d 100644
+--- a/blivet/devicefactory.py
+++ b/blivet/devicefactory.py
+@@ -383,6 +383,7 @@ class DeviceFactory(object):
+         # used for error recovery
+         self.__devices = []
+         self.__actions = []
+        self.__roots = []
+ 
+     def _is_container_encrypted(self):
+         return all(isinstance(p, LUKSDevice) for p in self.device.container.parents)
+@@ -994,10 +995,12 @@ class DeviceFactory(object):
+         _blivet_copy = self.storage.copy()
+         self.__devices = _blivet_copy.devicetree._devices
+         self.__actions = _blivet_copy.devicetree._actions
+        self.__roots = _blivet_copy.roots
+ 
+     def _revert_devicetree(self):
+         self.storage.devicetree._devices = self.__devices
+         self.storage.devicetree._actions = self.__actions
+        self.storage.roots = self.__roots
+ 
+ 
+ class PartitionFactory(DeviceFactory):
+-- 
+2.38.1
+
--- a/SOURCES/0007-Do-not-set-chunk-size-for-RAID1.patch
+++ b/SOURCES/0007-Do-not-set-chunk-size-for-RAID1.patch
@ -1,151 +0,0 @@
-From dc1e2fe7783748528cac2f7aa516c89d1959b052 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Thu, 29 Jul 2021 14:44:22 +0200
-Subject: [PATCH] Do not set chunk size for RAID 1
-
-Setting chunk size for RAID 1 doesn't make sense and latest
-mdadm started returning error instead of ignoring the --chunk
-option when creating an array.
-
-Resolves: rhbz#1987170
---
- blivet/devicelibs/raid.py     | 12 ++++++++++
- blivet/devices/md.py          | 15 ++++++++++---
- tests/devices_test/md_test.py | 41 +++++++++++++++++++++++++++++++++--
- 3 files changed, 63 insertions(+), 5 deletions(-)
-
-diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
-index 19c3fae98..a9e241c7a 100644
--- a/blivet/devicelibs/raid.py
-+++ b/blivet/devicelibs/raid.py
-@@ -462,6 +462,18 @@ def _pad(self, size, chunk_size):
-     def _get_recommended_stride(self, member_count):
-         return None
- 
-+    def get_size(self, member_sizes, num_members=None, chunk_size=None, superblock_size_func=None):
-+        if not member_sizes:
-+            return Size(0)
-+
-+        if num_members is None:
-+            num_members = len(member_sizes)
-+
-+        min_size = min(member_sizes)
-+        superblock_size = superblock_size_func(min_size)
-+        min_data_size = self._trim(min_size - superblock_size, chunk_size)
-+        return self.get_net_array_size(num_members, min_data_size)
-+
- 
- RAID1 = RAID1()
- ALL_LEVELS.add_raid_level(RAID1)
-diff --git a/blivet/devices/md.py b/blivet/devices/md.py
-index 69eee93a5..d1a2faf1f 100644
--- a/blivet/devices/md.py
-+++ b/blivet/devices/md.py
-@@ -138,7 +138,7 @@ def __init__(self, name, level=None, major=None, minor=None, size=None,
-         if self.exists:
-             self._chunk_size = self.read_chunk_size()
-         else:
-            self._chunk_size = chunk_size or mdraid.MD_CHUNK_SIZE
-+            self.chunk_size = chunk_size or Size(0)
- 
-         if not self.exists and not isinstance(metadata_version, str):
-             self.metadata_version = "default"
-@@ -208,8 +208,14 @@ def sector_size(self):
- 
-     @property
-     def chunk_size(self):
-        if self.exists and self._chunk_size == Size(0):
-            self._chunk_size = self.read_chunk_size()
-+        if self._chunk_size == Size(0):
-+            if self.exists:
-+                return self.read_chunk_size()
-+            else:
-+                if self.level == raid.RAID1:
-+                    return self._chunk_size
-+                else:
-+                    return mdraid.MD_CHUNK_SIZE
-         return self._chunk_size
- 
-     @chunk_size.setter
-@@ -223,6 +229,9 @@ def chunk_size(self, newsize):
-         if self.exists:
-             raise ValueError("cannot set chunk size for an existing device")
- 
-+        if self.level == raid.RAID1 and newsize != Size(0):
-+            raise ValueError("specifying chunk size is not allowed for raid1")
-+
-         self._chunk_size = newsize
- 
-     def read_chunk_size(self):
-diff --git a/tests/devices_test/md_test.py b/tests/devices_test/md_test.py
-index 46df76d3d..47a0fa0cc 100644
--- a/tests/devices_test/md_test.py
-+++ b/tests/devices_test/md_test.py
-@@ -1,6 +1,11 @@
- import six
- import unittest
- 
-+try:
-+    from unittest.mock import patch
-+except ImportError:
-+    from mock import patch
-+
- import blivet
- 
- from blivet.devices import StorageDevice
-@@ -27,9 +32,27 @@ def test_chunk_size1(self):
-         raid_array = MDRaidArrayDevice(name="raid", level="raid0", member_devices=2,
-                                        total_devices=2, parents=[member1, member2])
- 
-        # no chunk_size specified -- default value
-+        # no chunk_size specified and RAID0 -- default value
-         self.assertEqual(raid_array.chunk_size, mdraid.MD_CHUNK_SIZE)
- 
-+        with patch("blivet.devices.md.blockdev.md.create") as md_create:
-+            raid_array._create()
-+            md_create.assert_called_with("/dev/md/raid", "raid0", ["/dev/member1", "/dev/member2"],
-+                                         0, version="default", bitmap=False,
-+                                         chunk_size=mdraid.MD_CHUNK_SIZE)
-+
-+        raid_array = MDRaidArrayDevice(name="raid", level="raid1", member_devices=2,
-+                                       total_devices=2, parents=[member1, member2])
-+
-+        # no chunk_size specified and RAID1 -- no chunk size set (0)
-+        self.assertEqual(raid_array.chunk_size, Size(0))
-+
-+        with patch("blivet.devices.md.blockdev.md.create") as md_create:
-+            raid_array._create()
-+            md_create.assert_called_with("/dev/md/raid", "raid1", ["/dev/member1", "/dev/member2"],
-+                                         0, version="default", bitmap=True,
-+                                         chunk_size=0)
-+
-     def test_chunk_size2(self):
- 
-         member1 = StorageDevice("member1", fmt=blivet.formats.get_format("mdmember"),
-@@ -40,11 +63,25 @@ def test_chunk_size2(self):
-         raid_array = MDRaidArrayDevice(name="raid", level="raid0", member_devices=2,
-                                        total_devices=2, parents=[member1, member2],
-                                        chunk_size=Size("1024 KiB"))
-
-         self.assertEqual(raid_array.chunk_size, Size("1024 KiB"))
- 
-+        # for raid0 setting chunk_size = 0 means "default"
-+        raid_array.chunk_size = Size(0)
-+        self.assertEqual(raid_array.chunk_size, mdraid.MD_CHUNK_SIZE)
-+
-         with six.assertRaisesRegex(self, ValueError, "new chunk size must be of type Size"):
-             raid_array.chunk_size = 1
- 
-         with six.assertRaisesRegex(self, ValueError, "new chunk size must be multiple of 4 KiB"):
-             raid_array.chunk_size = Size("5 KiB")
-+
-+        with six.assertRaisesRegex(self, ValueError, "specifying chunk size is not allowed for raid1"):
-+            MDRaidArrayDevice(name="raid", level="raid1", member_devices=2,
-+                              total_devices=2, parents=[member1, member2],
-+                              chunk_size=Size("1024 KiB"))
-+
-+        raid_array = MDRaidArrayDevice(name="raid", level="raid1", member_devices=2,
-+                                       total_devices=2, parents=[member1, member2])
-+
-+        with six.assertRaisesRegex(self, ValueError, "specifying chunk size is not allowed for raid1"):
-+            raid_array.chunk_size = Size("512 KiB")
--- a/SOURCES/0007-Fix-potential-AttributeError-when-getting-stratis-bl.patch
+++ b/SOURCES/0007-Fix-potential-AttributeError-when-getting-stratis-bl.patch
@ -0,0 +1,45 @@
+From 1561bfe8820118178bbb07021adc1cacd875c4c7 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Tue, 18 Oct 2022 12:28:37 +0200
+Subject: [PATCH] Fix potential AttributeError when getting stratis blockdev
+ info
+
+---
+ blivet/static_data/stratis_info.py | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/blivet/static_data/stratis_info.py b/blivet/static_data/stratis_info.py
+index bd1c5a18..42f230ee 100644
+--- a/blivet/static_data/stratis_info.py
+++ b/blivet/static_data/stratis_info.py
+@@ -124,20 +124,22 @@ class StratisInfo(object):
+             log.error("Failed to get DBus properties of '%s'", blockdev_path)
+             return None
+ 
+        blockdev_uuid = str(uuid.UUID(properties["Uuid"]))
+
+         pool_path = properties["Pool"]
+         if pool_path == "/":
+             pool_name = ""
+            return StratisBlockdevInfo(path=properties["Devnode"], uuid=blockdev_uuid,
+                                       pool_name="", pool_uuid="", object_path=blockdev_path)
+         else:
+             pool_info = self._get_pool_info(properties["Pool"])
+             if not pool_info:
+                 return None
+             pool_name = pool_info.name
+ 
+-        blockdev_uuid = str(uuid.UUID(properties["Uuid"]))
+-
+-        return StratisBlockdevInfo(path=properties["Devnode"], uuid=blockdev_uuid,
+-                                   pool_name=pool_name, pool_uuid=pool_info.uuid,
+-                                   object_path=blockdev_path)
+            return StratisBlockdevInfo(path=properties["Devnode"], uuid=blockdev_uuid,
+                                       pool_name=pool_name, pool_uuid=pool_info.uuid,
+                                       object_path=blockdev_path)
+ 
+     def _get_locked_pools_info(self):
+         locked_pools = []
+-- 
+2.38.1
+
--- a/SOURCES/0008-Fix-running-tests-in-gating.patch
+++ b/SOURCES/0008-Fix-running-tests-in-gating.patch
@ -1,240 +0,0 @@
-From 3b9a781e138830a190d16c8dd970b800a086de46 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Wed, 4 Aug 2021 13:00:53 +0200
-Subject: [PATCH 1/3] edd_test: Locate the edd_data based on the test file
- location
-
-We can't use the blivet.edd module location when running tests
-against installed version of blivet.
---
- tests/devicelibs_test/edd_test.py | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tests/devicelibs_test/edd_test.py b/tests/devicelibs_test/edd_test.py
-index 23d736f4..7ec8d1e6 100644
--- a/tests/devicelibs_test/edd_test.py
-+++ b/tests/devicelibs_test/edd_test.py
-@@ -1,7 +1,6 @@
- import unittest
- import mock
- import os
-import inspect
- import logging
- import copy
- 
-@@ -110,9 +109,9 @@ class EddTestCase(unittest.TestCase):
-                 name = name[:-1]
-             if name.startswith("/"):
-                 name = name[1:]
-            dirname = os.path.dirname(inspect.getfile(edd))
-+            dirname = os.path.abspath(os.path.dirname(__file__))
-             return os.path.join(dirname,
-                                "../../tests/devicelibs_test/edd_data/",
-+                                "edd_data/",
-                                 name)
- 
-     def edd_debug(self, *args):
-- 
-2.31.1
-
-
-From 7ad3824fceb98e2741820b76a9cfea5add338343 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Wed, 4 Aug 2021 13:02:08 +0200
-Subject: [PATCH 2/3] tests: Allow running tests without the tests directory in
- PYTHONPATH
-
-When running the tests against installed version of blivet, the
-"tests" directory is not in PYTHONPATH so we need to import all
-helper modules using relative path.
---
- tests/action_test.py                           | 2 +-
- tests/devicelibs_test/edd_test.py              | 2 +-
- tests/{ => devicelibs_test}/lib.py             | 0
- tests/formats_test/fs_test.py                  | 2 +-
- tests/formats_test/fslabeling.py               | 2 +-
- tests/formats_test/fstesting.py                | 2 +-
- tests/formats_test/fsuuid.py                   | 2 +-
- tests/formats_test/labeling_test.py            | 2 +-
- tests/{ => formats_test}/loopbackedtestcase.py | 0
- tests/formats_test/luks_test.py                | 2 +-
- tests/formats_test/lvmpv_test.py               | 2 +-
- tests/partitioning_test.py                     | 2 +-
- 12 files changed, 10 insertions(+), 10 deletions(-)
- rename tests/{ => devicelibs_test}/lib.py (100%)
- rename tests/{ => formats_test}/loopbackedtestcase.py (100%)
-
-diff --git a/tests/action_test.py b/tests/action_test.py
-index 38a2e872..1e84c20b 100644
--- a/tests/action_test.py
-+++ b/tests/action_test.py
-@@ -6,7 +6,7 @@ if PY3:
- else:
-     from mock import Mock
- 
-from tests.storagetestcase import StorageTestCase
-+from storagetestcase import StorageTestCase
- import blivet
- from blivet.formats import get_format
- from blivet.size import Size
-diff --git a/tests/devicelibs_test/edd_test.py b/tests/devicelibs_test/edd_test.py
-index 7ec8d1e6..379c7aeb 100644
--- a/tests/devicelibs_test/edd_test.py
-+++ b/tests/devicelibs_test/edd_test.py
-@@ -6,7 +6,7 @@ import copy
- 
- from blivet import arch
- from blivet.devicelibs import edd
-from tests import lib
-+from . import lib
- 
- 
- class FakeDevice(object):
-diff --git a/tests/lib.py b/tests/devicelibs_test/lib.py
-similarity index 100%
-rename from tests/lib.py
-rename to tests/devicelibs_test/lib.py
-diff --git a/tests/formats_test/fs_test.py b/tests/formats_test/fs_test.py
-index ab3499a7..bd643370 100644
--- a/tests/formats_test/fs_test.py
-+++ b/tests/formats_test/fs_test.py
-@@ -10,7 +10,7 @@ from blivet.errors import DeviceFormatError
- from blivet.formats import get_format
- from blivet.devices import PartitionDevice, DiskDevice
- 
-from tests import loopbackedtestcase
-+from . import loopbackedtestcase
- 
- from . import fstesting
- 
-diff --git a/tests/formats_test/fslabeling.py b/tests/formats_test/fslabeling.py
-index fbb28eee..0e0dc261 100644
--- a/tests/formats_test/fslabeling.py
-+++ b/tests/formats_test/fslabeling.py
-@@ -2,7 +2,7 @@
- import abc
- import six
- 
-from tests import loopbackedtestcase
-+from . import loopbackedtestcase
- from blivet.errors import FSError, FSReadLabelError
- from blivet.size import Size
- 
-diff --git a/tests/formats_test/fstesting.py b/tests/formats_test/fstesting.py
-index 86b2a116..e34584d8 100644
--- a/tests/formats_test/fstesting.py
-+++ b/tests/formats_test/fstesting.py
-@@ -5,7 +5,7 @@ from six import add_metaclass
- import os
- import tempfile
- 
-from tests import loopbackedtestcase
-+from . import loopbackedtestcase
- from blivet.errors import FSError, FSResizeError, DeviceFormatError
- from blivet.size import Size, ROUND_DOWN
- from blivet.formats import fs
-diff --git a/tests/formats_test/fsuuid.py b/tests/formats_test/fsuuid.py
-index c8003945..16aa19a6 100644
--- a/tests/formats_test/fsuuid.py
-+++ b/tests/formats_test/fsuuid.py
-@@ -3,7 +3,7 @@ import abc
- import six
- from unittest import skipIf
- 
-from tests import loopbackedtestcase
-+from . import loopbackedtestcase
- from blivet.errors import FSError, FSWriteUUIDError
- from blivet.size import Size
- from blivet.util import capture_output
-diff --git a/tests/formats_test/labeling_test.py b/tests/formats_test/labeling_test.py
-index e26cb7df..d24e6619 100644
--- a/tests/formats_test/labeling_test.py
-+++ b/tests/formats_test/labeling_test.py
-@@ -1,10 +1,10 @@
- import unittest
- 
-from tests import loopbackedtestcase
- from blivet.formats import device_formats
- import blivet.formats.fs as fs
- import blivet.formats.swap as swap
- 
-+from . import loopbackedtestcase
- from . import fslabeling
- 
- 
-diff --git a/tests/loopbackedtestcase.py b/tests/formats_test/loopbackedtestcase.py
-similarity index 100%
-rename from tests/loopbackedtestcase.py
-rename to tests/formats_test/loopbackedtestcase.py
-diff --git a/tests/formats_test/luks_test.py b/tests/formats_test/luks_test.py
-index be0d50b0..5423ebdf 100644
--- a/tests/formats_test/luks_test.py
-+++ b/tests/formats_test/luks_test.py
-@@ -7,7 +7,7 @@ from blivet.formats.luks import LUKS
- 
- from blivet.size import Size
- 
-from tests import loopbackedtestcase
-+from . import loopbackedtestcase
- 
- 
- class LUKSTestCase(loopbackedtestcase.LoopBackedTestCase):
-diff --git a/tests/formats_test/lvmpv_test.py b/tests/formats_test/lvmpv_test.py
-index 792a2f1d..da7270d9 100644
--- a/tests/formats_test/lvmpv_test.py
-+++ b/tests/formats_test/lvmpv_test.py
-@@ -4,7 +4,7 @@ from blivet.formats.lvmpv import LVMPhysicalVolume
- 
- from blivet.size import Size
- 
-from tests import loopbackedtestcase
-+from . import loopbackedtestcase
- 
- 
- class LVMPVTestCase(loopbackedtestcase.LoopBackedTestCase):
-diff --git a/tests/partitioning_test.py b/tests/partitioning_test.py
-index b7aa5045..a713aaa1 100644
--- a/tests/partitioning_test.py
-+++ b/tests/partitioning_test.py
-@@ -29,7 +29,7 @@ from blivet.devices.lvm import LVMCacheRequest
- 
- from blivet.errors import PartitioningError
- 
-from tests.imagebackedtestcase import ImageBackedTestCase
-+from imagebackedtestcase import ImageBackedTestCase
- from blivet.blivet import Blivet
- from blivet.util import sparsetmpfile
- from blivet.formats import get_format
-- 
-2.31.1
-
-
-From 9ee41c8b60c56ce752e305be73001c7089f43011 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Fri, 6 Aug 2021 14:51:01 +0200
-Subject: [PATCH 3/3] tests: Print version and blivet location when running
- tests
-
---
- tests/run_tests.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/run_tests.py b/tests/run_tests.py
-index 32e3f2d3..8ad8b61a 100644
--- a/tests/run_tests.py
-+++ b/tests/run_tests.py
-@@ -32,6 +32,11 @@ if __name__ == '__main__':
- 
-     testdir = os.path.abspath(os.path.dirname(__file__))
- 
-+    import blivet
-+    print("Running tests with Blivet %s from %s" % (blivet.__version__,
-+                                                    os.path.abspath(os.path.dirname(blivet.__file__))),
-+          file=sys.stderr)
-+
-     if args.testname:
-         for n in args.testname:
-             suite.addTests(unittest.TestLoader().loadTestsFromName(n))
-- 
-2.31.1
-
--- a/SOURCES/0008-tests-Skip-XFS-resize-test-on-CentOS-RHEL-8.patch
+++ b/SOURCES/0008-tests-Skip-XFS-resize-test-on-CentOS-RHEL-8.patch
@ -0,0 +1,27 @@
+From b747c4ed07937f54a546ffb2f2c8c95e0797dd6c Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 20 Oct 2022 15:19:29 +0200
+Subject: [PATCH] tests: Skip XFS resize test on CentOS/RHEL 8
+
+Partitions on loop devices are broken on CentOS/RHEL 8.
+---
+ tests/skip.yml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/skip.yml b/tests/skip.yml
+index 568c3fff..66b34493 100644
+--- a/tests/skip.yml
+++ b/tests/skip.yml
+@@ -29,3 +29,9 @@
+     - distro: "centos"
+       version: "9"
+       reason: "Creating RAID 1 LV on CentOS/RHEL 9 causes a system deadlock"
+
+- test: storage_tests.formats_test.fs_test.XFSTestCase.test_resize
+  skip_on:
+    - distro: ["centos", "enterprise_linux"]
+      version: "8"
+      reason: "Creating partitions on loop devices is broken on CentOS/RHEL 8 latest kernel"
+--
+2.37.3
+
--- a/SOURCES/0009-PO-update.patch
+++ b/SOURCES/0009-PO-update.patch
--- a/SOURCES/0009-Revert-Adjust-to-new-XFS-min-size.patch
+++ b/SOURCES/0009-Revert-Adjust-to-new-XFS-min-size.patch
@ -0,0 +1,160 @@
+From 9618b84f94187efddc7316c2546bed923a91ecf9 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 3 Nov 2022 08:36:27 +0100
+Subject: [PATCH 1/2] Revert "Set XFS minimal size to 300 MiB"
+
+This reverts commit 307d49833771d161314bae50c68e70dc35c3bb36.
+---
+ blivet/formats/fs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
+index 8c346aa5..33922f3a 100644
+--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
+@@ -1091,7 +1091,7 @@ class XFS(FS):
+     _modules = ["xfs"]
+     _labelfs = fslabeling.XFSLabeling()
+     _uuidfs = fsuuid.XFSUUID()
+-    _min_size = Size("300 MiB")
+    _min_size = Size("16 MiB")
+     _max_size = Size("16 EiB")
+     _formattable = True
+     _linux_native = True
+-- 
+2.38.1
+
+
+From 24d94922d6879baa85aaa101f6b21efa568a9cbc Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 3 Nov 2022 08:36:39 +0100
+Subject: [PATCH 2/2] Revert "tests: Create bigger devices for XFS testing"
+
+This reverts commit 467cb8024010b2cabb1e92d9e64f6d3cbe949ad9.
+---
+ tests/storage_tests/formats_test/fs_test.py       | 7 +++----
+ tests/storage_tests/formats_test/fslabeling.py    | 4 +---
+ tests/storage_tests/formats_test/fsuuid.py        | 4 +---
+ tests/storage_tests/formats_test/labeling_test.py | 2 --
+ tests/storage_tests/formats_test/uuid_test.py     | 3 ---
+ 5 files changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/tests/storage_tests/formats_test/fs_test.py b/tests/storage_tests/formats_test/fs_test.py
+index cf8fb441..97f4cbbe 100644
+--- a/tests/storage_tests/formats_test/fs_test.py
+++ b/tests/storage_tests/formats_test/fs_test.py
+@@ -54,7 +54,6 @@ class ReiserFSTestCase(fstesting.FSAsRoot):
+ 
+ class XFSTestCase(fstesting.FSAsRoot):
+     _fs_class = fs.XFS
+-    _DEVICE_SIZE = Size("500 MiB")
+ 
+     def can_resize(self, an_fs):
+         resize_tasks = (an_fs._resize, an_fs._size_info)
+@@ -96,12 +95,12 @@ class XFSTestCase(fstesting.FSAsRoot):
+             self.assertFalse(an_fs.resizable)
+             # Not resizable, so can not do resizing actions.
+             with self.assertRaises(DeviceFormatError):
+-                an_fs.target_size = Size("300 MiB")
+                an_fs.target_size = Size("64 MiB")
+             with self.assertRaises(DeviceFormatError):
+                 an_fs.do_resize()
+         else:
+             disk = DiskDevice(os.path.basename(self.loop_devices[0]))
+-            part = self._create_partition(disk, Size("300 MiB"))
+            part = self._create_partition(disk, Size("50 MiB"))
+             an_fs = self._fs_class()
+             an_fs.device = part.path
+             self.assertIsNone(an_fs.create())
+@@ -114,7 +113,7 @@ class XFSTestCase(fstesting.FSAsRoot):
+             part = self._create_partition(disk, size=part.size + Size("40 MiB"))
+ 
+             # Try a reasonable target size
+-            TARGET_SIZE = Size("325 MiB")
+            TARGET_SIZE = Size("64 MiB")
+             an_fs.target_size = TARGET_SIZE
+             self.assertEqual(an_fs.target_size, TARGET_SIZE)
+             self.assertNotEqual(an_fs._size, TARGET_SIZE)
+diff --git a/tests/storage_tests/formats_test/fslabeling.py b/tests/storage_tests/formats_test/fslabeling.py
+index ebe0b70a..0e0dc261 100644
+--- a/tests/storage_tests/formats_test/fslabeling.py
+++ b/tests/storage_tests/formats_test/fslabeling.py
+@@ -21,10 +21,8 @@ class LabelingAsRoot(loopbackedtestcase.LoopBackedTestCase):
+     _invalid_label = abc.abstractproperty(
+         doc="A label which is invalid for this filesystem.")
+ 
+-    _DEVICE_SIZE = Size("100 MiB")
+-
+     def __init__(self, methodName='run_test'):
+-        super(LabelingAsRoot, self).__init__(methodName=methodName, device_spec=[self._DEVICE_SIZE])
+        super(LabelingAsRoot, self).__init__(methodName=methodName, device_spec=[Size("100 MiB")])
+ 
+     def setUp(self):
+         an_fs = self._fs_class()
+diff --git a/tests/storage_tests/formats_test/fsuuid.py b/tests/storage_tests/formats_test/fsuuid.py
+index 0b9762fd..16aa19a6 100644
+--- a/tests/storage_tests/formats_test/fsuuid.py
+++ b/tests/storage_tests/formats_test/fsuuid.py
+@@ -23,11 +23,9 @@ class SetUUID(loopbackedtestcase.LoopBackedTestCase):
+     _invalid_uuid = abc.abstractproperty(
+         doc="An invalid UUID for this filesystem.")
+ 
+-    _DEVICE_SIZE = Size("100 MiB")
+-
+     def __init__(self, methodName='run_test'):
+         super(SetUUID, self).__init__(methodName=methodName,
+-                                      device_spec=[self._DEVICE_SIZE])
+                                      device_spec=[Size("100 MiB")])
+ 
+     def setUp(self):
+         an_fs = self._fs_class()
+diff --git a/tests/storage_tests/formats_test/labeling_test.py b/tests/storage_tests/formats_test/labeling_test.py
+index 0702260a..d24e6619 100644
+--- a/tests/storage_tests/formats_test/labeling_test.py
+++ b/tests/storage_tests/formats_test/labeling_test.py
+@@ -1,7 +1,6 @@
+ import unittest
+ 
+ from blivet.formats import device_formats
+-from blivet.size import Size
+ import blivet.formats.fs as fs
+ import blivet.formats.swap as swap
+ 
+@@ -62,7 +61,6 @@ class InitializationTestCase(unittest.TestCase):
+ class XFSTestCase(fslabeling.CompleteLabelingAsRoot):
+     _fs_class = fs.XFS
+     _invalid_label = "root filesystem"
+-    _DEVICE_SIZE = Size("500 MiB")
+ 
+ 
+ class FATFSTestCase(fslabeling.CompleteLabelingAsRoot):
+diff --git a/tests/storage_tests/formats_test/uuid_test.py b/tests/storage_tests/formats_test/uuid_test.py
+index af35c0ee..ee8d452e 100644
+--- a/tests/storage_tests/formats_test/uuid_test.py
+++ b/tests/storage_tests/formats_test/uuid_test.py
+@@ -2,7 +2,6 @@ import unittest
+ 
+ import blivet.formats.fs as fs
+ import blivet.formats.swap as swap
+-from blivet.size import Size
+ 
+ from . import fsuuid
+ 
+@@ -53,14 +52,12 @@ class XFSTestCase(fsuuid.SetUUIDWithMkFs):
+     _fs_class = fs.XFS
+     _invalid_uuid = "abcdefgh-ijkl-mnop-qrst-uvwxyz123456"
+     _valid_uuid = "97e3d40f-dca8-497d-8b86-92f257402465"
+-    _DEVICE_SIZE = Size("500 MiB")
+ 
+ 
+ class XFSAfterTestCase(fsuuid.SetUUIDAfterMkFs):
+     _fs_class = fs.XFS
+     _invalid_uuid = "abcdefgh-ijkl-mnop-qrst-uvwxyz123456"
+     _valid_uuid = "97e3d40f-dca8-497d-8b86-92f257402465"
+-    _DEVICE_SIZE = Size("500 MiB")
+ 
+ 
+ class FATFSTestCase(fsuuid.SetUUIDWithMkFs):
+-- 
+2.38.1
+
--- a/SOURCES/0010-Catch-BlockDevNotImplementedError-for-btrfs-plugin-c.patch
+++ b/SOURCES/0010-Catch-BlockDevNotImplementedError-for-btrfs-plugin-c.patch
@ -0,0 +1,55 @@
+From fed62af06eb1584adbacd821dfe79c2df52c6aa4 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 2 Nov 2022 12:14:28 +0100
+Subject: [PATCH] Catch BlockDevNotImplementedError for btrfs plugin calls
+
+This is a workaround for RHEL where the btrfs plugin is not
+available and where we might still try to call some libblockdev
+functions to gather information about preexisting btrfs devices.
+---
+ blivet/devices/btrfs.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
+index 0e029715..1ae6a04d 100644
+--- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py
+@@ -362,7 +362,7 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
+         try:
+             subvols = blockdev.btrfs.list_subvolumes(mountpoint,
+                                                      snapshots_only=snapshots_only)
+-        except blockdev.BtrfsError as e:
+        except (blockdev.BtrfsError, blockdev.BlockDevNotImplementedError) as e:
+             log.debug("failed to list subvolumes: %s", e)
+         else:
+             self._get_default_subvolume_id()
+@@ -400,7 +400,7 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
+         with self._do_temp_mount() as mountpoint:
+             try:
+                 subvolid = blockdev.btrfs.get_default_subvolume_id(mountpoint)
+-            except blockdev.BtrfsError as e:
+            except (blockdev.BtrfsError, blockdev.BlockDevNotImplementedError) as e:
+                 log.debug("failed to get default subvolume id: %s", e)
+ 
+         self._default_subvolume_id = subvolid
+@@ -413,7 +413,7 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
+         with self._do_temp_mount() as mountpoint:
+             try:
+                 blockdev.btrfs.set_default_subvolume(mountpoint, vol_id)
+-            except blockdev.BtrfsError as e:
+            except (blockdev.BtrfsError, blockdev.BlockDevNotImplementedError) as e:
+                 log.error("failed to set new default subvolume id (%s): %s",
+                           vol_id, e)
+                 # The only time we set a new default subvolume is so we can remove
+@@ -471,7 +471,7 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
+         if not self.format.vol_uuid:
+             try:
+                 bd_info = blockdev.btrfs.filesystem_info(self.parents[0].path)
+-            except blockdev.BtrfsError as e:
+            except (blockdev.BtrfsError, blockdev.BlockDevNotImplementedError) as e:
+                 log.error("failed to get filesystem info for new btrfs volume %s", e)
+             else:
+                 self.format.vol_uuid = bd_info.uuid
+-- 
+2.38.1
+
--- a/SOURCES/0011-Default-to-encryption-sector-size-512-for-LUKS-devic.patch
+++ b/SOURCES/0011-Default-to-encryption-sector-size-512-for-LUKS-devic.patch
@ -0,0 +1,57 @@
+From 2aba050e74dc5df483da022dcf436b101c7a4301 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 11 Jan 2023 14:59:24 +0100
+Subject: [PATCH] Default to encryption sector size 512 for LUKS devices
+
+We are currently letting cryptsetup decide the optimal encryption
+sector size for LUKS. The problem is that for disks with physical
+sector size 4096 cryptsetup will default to 4096 encryption sector
+size even if the drive logical sector size is 512 which means
+these disks cannot be combined with other 512 logical sector size
+disks in LVM. This requires a more sophisticated solution in the
+future, but for now just default to 512 if not specified by the
+user otherwise.
+
+Resolves: rhbz#2103800
+---
+ blivet/formats/luks.py                      | 10 +++++++---
+ tests/unit_tests/formats_tests/luks_test.py |  2 +-
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py
+index 8de4911f..2637e0c5 100644
+--- a/blivet/formats/luks.py
+++ b/blivet/formats/luks.py
+@@ -166,9 +166,13 @@ class LUKS(DeviceFormat):
+             if self.pbkdf_args.type == "pbkdf2" and self.pbkdf_args.max_memory_kb:
+                 log.warning("Memory limit is not used for pbkdf2 and it will be ignored.")
+ 
+-        self.luks_sector_size = kwargs.get("luks_sector_size") or 0
+-        if self.luks_sector_size and self.luks_version != "luks2":
+-            raise ValueError("Sector size argument is valid only for LUKS version 2.")
+        self.luks_sector_size = kwargs.get("luks_sector_size")
+        if self.luks_version == "luks2":
+            if self.luks_sector_size is None:
+                self.luks_sector_size = 512  # XXX we don't want cryptsetup choose automatically here so fallback to 512
+        else:
+            if self.luks_sector_size:
+                raise ValueError("Sector size argument is valid only for LUKS version 2.")
+ 
+     def __repr__(self):
+         s = DeviceFormat.__repr__(self)
+diff --git a/tests/unit_tests/formats_tests/luks_test.py b/tests/unit_tests/formats_tests/luks_test.py
+index 5ae6acfe..ec7b7592 100644
+--- a/tests/unit_tests/formats_tests/luks_test.py
+++ b/tests/unit_tests/formats_tests/luks_test.py
+@@ -53,7 +53,7 @@ class LUKSNodevTestCase(unittest.TestCase):
+ 
+     def test_sector_size(self):
+         fmt = LUKS()
+-        self.assertEqual(fmt.luks_sector_size, 0)
+        self.assertEqual(fmt.luks_sector_size, 512)
+ 
+         with self.assertRaises(ValueError):
+             fmt = LUKS(luks_version="luks1", luks_sector_size=4096)
+-- 
+2.39.0
+
--- a/SOURCES/0012-Add-support-for-specifying-stripe-size-for-RAID-LVs.patch
+++ b/SOURCES/0012-Add-support-for-specifying-stripe-size-for-RAID-LVs.patch
@ -0,0 +1,172 @@
+From 11c3e695d9a2130f325bb5459a9881ff70338f71 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 9 Mar 2023 13:18:42 +0100
+Subject: [PATCH] Add support for specifying stripe size for RAID LVs
+
+---
+ blivet/devices/lvm.py                        | 28 +++++++++++++++++---
+ tests/storage_tests/devices_test/lvm_test.py | 12 +++++++--
+ tests/unit_tests/devices_test/lvm_test.py    | 27 +++++++++++++++++++
+ 3 files changed, 61 insertions(+), 6 deletions(-)
+
+diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
+index b8595d63..41358e9b 100644
+--- a/blivet/devices/lvm.py
+++ b/blivet/devices/lvm.py
+@@ -659,7 +659,8 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+ 
+     def __init__(self, name, parents=None, size=None, uuid=None, seg_type=None,
+                  fmt=None, exists=False, sysfs_path='', grow=None, maxsize=None,
+-                 percent=None, cache_request=None, pvs=None, from_lvs=None):
+                 percent=None, cache_request=None, pvs=None, from_lvs=None,
+                 stripe_size=0):
+ 
+         if not exists:
+             if seg_type not in [None, "linear", "thin", "thin-pool", "cache", "vdo-pool", "vdo", "cache-pool"] + lvm.raid_seg_types:
+@@ -756,6 +757,15 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+         if self._pv_specs:
+             self._assign_pv_space()
+ 
+        self._stripe_size = stripe_size
+        if not self.exists and self._stripe_size:
+            if self.seg_type not in lvm.raid_seg_types:
+                raise errors.DeviceError("Stripe size can be specified only for RAID volumes")
+            if self.seg_type in ("raid1", "RAID1", "1", 1, "mirror"):
+                raise errors.DeviceError("Specifying stripe size is not allowed for RAID1 or mirror")
+            if self.cache:
+                raise errors.DeviceError("Creating cached LVs with custom stripe size is not supported")
+
+     def _assign_pv_space(self):
+         if not self.is_raid_lv:
+             # nothing to do for non-RAID (and thus non-striped) LVs here
+@@ -2295,7 +2305,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+                  parent_lv=None, int_type=None, origin=None, vorigin=False,
+                  metadata_size=None, chunk_size=None, profile=None, from_lvs=None,
+                  compression=False, deduplication=False, index_memory=0,
+-                 write_policy=None, cache_mode=None, attach_to=None):
+                 write_policy=None, cache_mode=None, attach_to=None, stripe_size=0):
+         """
+             :param name: the device name (generally a device node's basename)
+             :type name: str
+@@ -2375,6 +2385,11 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+                                 be attached to when created
+             :type attach_to: :class:`LVMLogicalVolumeDevice`
+ 
+            For RAID LVs only:
+
+            :keyword stripe_size: size of the RAID stripe
+            :type stripe_size: :class:`~.size.Size`
+
+         """
+ 
+         if isinstance(parents, (list, ParentList)):
+@@ -2395,7 +2410,8 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+         LVMCachePoolMixin.__init__(self, metadata_size, cache_mode, attach_to)
+         LVMLogicalVolumeBase.__init__(self, name, parents, size, uuid, seg_type,
+                                       fmt, exists, sysfs_path, grow, maxsize,
+-                                      percent, cache_request, pvs, from_lvs)
+                                      percent, cache_request, pvs, from_lvs,
+                                      stripe_size)
+         LVMVDOPoolMixin.__init__(self, compression, deduplication, index_memory,
+                                  write_policy)
+         LVMVDOLogicalVolumeMixin.__init__(self)
+@@ -2651,8 +2667,12 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+             pvs = [spec.pv.path for spec in self._pv_specs]
+             pvs = pvs or None
+ 
+            extra = dict()
+            if self._stripe_size:
+                extra["stripesize"] = str(int(self._stripe_size.convert_to("KiB")))
+
+             blockdev.lvm.lvcreate(self.vg.name, self._name, self.size,
+-                                  type=self.seg_type, pv_list=pvs)
+                                  type=self.seg_type, pv_list=pvs, **extra)
+         else:
+             fast_pvs = [pv.path for pv in self.cache.fast_pvs]
+ 
+diff --git a/tests/storage_tests/devices_test/lvm_test.py b/tests/storage_tests/devices_test/lvm_test.py
+index a055fc27..97ef1c4b 100644
+--- a/tests/storage_tests/devices_test/lvm_test.py
+++ b/tests/storage_tests/devices_test/lvm_test.py
+@@ -1,4 +1,5 @@
+ import os
+import subprocess
+ 
+ from ..storagetestcase import StorageTestCase
+ 
+@@ -127,7 +128,7 @@ class LVMTestCase(StorageTestCase):
+         self.assertTrue(snap.is_snapshot_lv)
+         self.assertEqual(snap.origin, thinlv)
+ 
+-    def _test_lvm_raid(self, seg_type, raid_level):
+    def _test_lvm_raid(self, seg_type, raid_level, stripe_size=0):
+         disk1 = self.storage.devicetree.get_device_by_path(self.vdevs[0])
+         self.assertIsNotNone(disk1)
+         self.storage.initialize_disk(disk1)
+@@ -151,7 +152,7 @@ class LVMTestCase(StorageTestCase):
+ 
+         raidlv = self.storage.new_lv(fmt_type="ext4", size=blivet.size.Size("50 MiB"),
+                                      parents=[vg], name="blivetTestRAIDLV",
+-                                     seg_type=seg_type, pvs=[pv1, pv2])
+                                     seg_type=seg_type, pvs=[pv1, pv2], stripe_size=stripe_size)
+         self.storage.create_device(raidlv)
+ 
+         self.storage.do_it()
+@@ -163,9 +164,16 @@ class LVMTestCase(StorageTestCase):
+         self.assertEqual(raidlv.raid_level, raid_level)
+         self.assertEqual(raidlv.seg_type, seg_type)
+ 
+        if stripe_size:
+            out = subprocess.check_output(["lvs", "-o", "stripe_size", "--noheadings", "--nosuffix", "--units=b", raidlv.vg.name + "/" + raidlv.lvname])
+            self.assertEqual(out.decode().strip(), str(int(stripe_size.convert_to())))
+
+     def test_lvm_raid_raid0(self):
+         self._test_lvm_raid("raid0", blivet.devicelibs.raid.RAID0)
+ 
+    def test_lvm_raid_raid0_stripe_size(self):
+        self._test_lvm_raid("raid0", blivet.devicelibs.raid.RAID0, stripe_size=blivet.size.Size("1 MiB"))
+
+     def test_lvm_raid_striped(self):
+         self._test_lvm_raid("striped", blivet.devicelibs.raid.Striped)
+ 
+diff --git a/tests/unit_tests/devices_test/lvm_test.py b/tests/unit_tests/devices_test/lvm_test.py
+index 995c2da4..d7b55224 100644
+--- a/tests/unit_tests/devices_test/lvm_test.py
+++ b/tests/unit_tests/devices_test/lvm_test.py
+@@ -363,6 +363,33 @@ class LVMDeviceTest(unittest.TestCase):
+         self.assertEqual(pv.format.free, Size("264 MiB"))
+         self.assertEqual(pv2.format.free, Size("256 MiB"))
+ 
+    def test_lvm_logical_volume_raid_stripe_size(self):
+        pv = StorageDevice("pv1", fmt=blivet.formats.get_format("lvmpv"),
+                           size=Size("1025 MiB"))
+        pv2 = StorageDevice("pv2", fmt=blivet.formats.get_format("lvmpv"),
+                            size=Size("513 MiB"))
+        vg = LVMVolumeGroupDevice("testvg", parents=[pv, pv2])
+
+        with self.assertRaises(blivet.errors.DeviceError):
+            # non-raid LV
+            lv = LVMLogicalVolumeDevice("testlv", parents=[vg], size=Size("1 GiB"),
+                                        fmt=blivet.formats.get_format("xfs"),
+                                        exists=False, stripe_size=Size("1 MiB"))
+
+        with self.assertRaises(blivet.errors.DeviceError):
+            # raid1 LV
+            lv = LVMLogicalVolumeDevice("testlv", parents=[vg], size=Size("1 GiB"),
+                                        fmt=blivet.formats.get_format("xfs"),
+                                        exists=False, seg_type="raid1", pvs=[pv, pv2],
+                                        stripe_size=Size("1 MiB"))
+
+        lv = LVMLogicalVolumeDevice("testlv", parents=[vg], size=Size("1 GiB"),
+                                    fmt=blivet.formats.get_format("xfs"),
+                                    exists=False, seg_type="raid0", pvs=[pv, pv2],
+                                    stripe_size=Size("1 MiB"))
+
+        self.assertEqual(lv._stripe_size, Size("1 MiB"))
+
+     def test_target_size(self):
+         pv = StorageDevice("pv1", fmt=blivet.formats.get_format("lvmpv"),
+                            size=Size("1 GiB"))
+-- 
+2.40.1
+
--- a/SOURCES/0013-Fix-setting-kickstart-data.patch
+++ b/SOURCES/0013-Fix-setting-kickstart-data.patch
@ -0,0 +1,68 @@
+From 1af0d3c37a93e431790e641a329a7f34dabf291a Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 2 Mar 2023 12:34:42 +0100
+Subject: [PATCH] Fix setting kickstart data
+
+When changing our code to PEP8 compliant we also changed some
+pykickstart properties like onPart by accident. This PR fixes this.
+
+Resolves: rhbz#2175166
+---
+ blivet/devices/btrfs.py     | 4 ++--
+ blivet/devices/lvm.py       | 2 +-
+ blivet/devices/partition.py | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
+index 1ae6a04d..3f56624e 100644
+--- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py
+@@ -498,8 +498,8 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
+ 
+     def populate_ksdata(self, data):
+         super(BTRFSVolumeDevice, self).populate_ksdata(data)
+-        data.data_level = self.data_level.name if self.data_level else None
+-        data.metadata_level = self.metadata_level.name if self.metadata_level else None
+        data.dataLevel = self.data_level.name if self.data_level else None
+        data.metaDataLevel = self.metadata_level.name if self.metadata_level else None
+         data.devices = ["btrfs.%d" % p.id for p in self.parents]
+         data.preexist = self.exists
+ 
+diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
+index 41358e9b..c3132457 100644
+--- a/blivet/devices/lvm.py
+++ b/blivet/devices/lvm.py
+@@ -1161,7 +1161,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+ 
+             if self.req_grow:
+                 # base size could be literal or percentage
+-                data.max_size_mb = self.req_max_size.convert_to(MiB)
+                data.maxSizeMB = self.req_max_size.convert_to(MiB)
+         elif data.resize:
+             data.size = self.target_size.convert_to(MiB)
+ 
+diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py
+index 89d907c2..0e9250ce 100644
+--- a/blivet/devices/partition.py
+++ b/blivet/devices/partition.py
+@@ -982,14 +982,14 @@ class PartitionDevice(StorageDevice):
+             data.size = self.req_base_size.round_to_nearest(MiB, rounding=ROUND_DOWN).convert_to(spec=MiB)
+             data.grow = self.req_grow
+             if self.req_grow:
+-                data.max_size_mb = self.req_max_size.convert_to(MiB)
+                data.maxSizeMB = self.req_max_size.convert_to(MiB)
+ 
+             # data.disk = self.disk.name                      # by-id
+             if self.req_disks and len(self.req_disks) == 1:
+                 data.disk = self.disk.name
+-            data.prim_only = self.req_primary
+            data.primOnly = self.req_primary
+         else:
+-            data.on_part = self.name                     # by-id
+            data.onPart = self.name                     # by-id
+ 
+             if data.resize:
+                 # on s390x in particular, fractional sizes are reported, which
+-- 
+2.40.1
+
--- a/SOURCES/0014-Do-not-set-memory-limit-for-LUKS2-when-running-in-FI.patch
+++ b/SOURCES/0014-Do-not-set-memory-limit-for-LUKS2-when-running-in-FI.patch
@ -0,0 +1,133 @@
+From c2b06150df0b876c7d442097b6c9ca90c9ca2ecc Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 4 May 2023 11:35:44 +0200
+Subject: [PATCH] Do not set memory limit for LUKS2 when running in FIPS mode
+
+With FIPS enabled LUKS uses pbkdf and not argon so the memory
+limit is not a valid parameter.
+
+Resolves: rhbz#2183437
+---
+ blivet/devicelibs/crypto.py                   | 11 +++++++
+ blivet/formats/luks.py                        | 12 ++++----
+ tests/unit_tests/formats_tests/luks_test.py   | 30 +++++++++++++++++++
+ .../unit_tests/formats_tests/methods_test.py  |  3 +-
+ 4 files changed, 50 insertions(+), 6 deletions(-)
+
+diff --git a/blivet/devicelibs/crypto.py b/blivet/devicelibs/crypto.py
+index f0caf0f7..68e68db1 100644
+--- a/blivet/devicelibs/crypto.py
+++ b/blivet/devicelibs/crypto.py
+@@ -21,6 +21,7 @@
+ #
+ 
+ import hashlib
+import os
+ 
+ import gi
+ gi.require_version("BlockDev", "2.0")
+@@ -100,3 +101,13 @@ def calculate_integrity_metadata_size(device_size, algorithm=DEFAULT_INTEGRITY_A
+     jsize = (jsize / SECTOR_SIZE + 1) * SECTOR_SIZE  # round up to sector
+ 
+     return msize + jsize
+
+
+def is_fips_enabled():
+    if not os.path.exists("/proc/sys/crypto/fips_enabled"):
+        # if the file doesn't exist, we are definitely not in FIPS mode
+        return False
+
+    with open("/proc/sys/crypto/fips_enabled", "r") as f:
+        enabled = f.read()
+    return enabled.strip() == "1"
+diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py
+index 2637e0c5..adf3c711 100644
+--- a/blivet/formats/luks.py
+++ b/blivet/formats/luks.py
+@@ -303,11 +303,13 @@ class LUKS(DeviceFormat):
+             if luks_data.pbkdf_args:
+                 self.pbkdf_args = luks_data.pbkdf_args
+             else:
+-                mem_limit = crypto.calculate_luks2_max_memory()
+-                if mem_limit:
+-                    self.pbkdf_args = LUKS2PBKDFArgs(max_memory_kb=int(mem_limit.convert_to(KiB)))
+-                    luks_data.pbkdf_args = self.pbkdf_args
+-                    log.info("PBKDF arguments for LUKS2 not specified, using defaults with memory limit %s", mem_limit)
+                # argon is not used with FIPS so we don't need to adjust the memory when in FIPS mode
+                if not crypto.is_fips_enabled():
+                    mem_limit = crypto.calculate_luks2_max_memory()
+                    if mem_limit:
+                        self.pbkdf_args = LUKS2PBKDFArgs(max_memory_kb=int(mem_limit.convert_to(KiB)))
+                        luks_data.pbkdf_args = self.pbkdf_args
+                        log.info("PBKDF arguments for LUKS2 not specified, using defaults with memory limit %s", mem_limit)
+ 
+         if self.pbkdf_args:
+             pbkdf = blockdev.CryptoLUKSPBKDF(type=self.pbkdf_args.type,
+diff --git a/tests/unit_tests/formats_tests/luks_test.py b/tests/unit_tests/formats_tests/luks_test.py
+index ec7b7592..1127e968 100644
+--- a/tests/unit_tests/formats_tests/luks_test.py
+++ b/tests/unit_tests/formats_tests/luks_test.py
+@@ -6,9 +6,14 @@ except ImportError:
+ import unittest
+ 
+ from blivet.formats.luks import LUKS
+from blivet.size import Size
+from blivet.static_data import luks_data
+ 
+ 
+ class LUKSNodevTestCase(unittest.TestCase):
+    def setUp(self):
+        luks_data.pbkdf_args = None
+
+     def test_create_discard_option(self):
+         # flags.discard_new=False --> no discard
+         fmt = LUKS(exists=False)
+@@ -51,6 +56,31 @@ class LUKSNodevTestCase(unittest.TestCase):
+         fmt = LUKS(cipher="aes-cbc-plain64")
+         self.assertEqual(fmt.key_size, 0)
+ 
+    def test_luks2_pbkdf_memory_fips(self):
+        fmt = LUKS()
+        with patch("blivet.formats.luks.blockdev.crypto") as bd:
+            # fips enabled, pbkdf memory should not be set
+            with patch("blivet.formats.luks.crypto") as crypto:
+                attrs = {"is_fips_enabled.return_value": True,
+                         "get_optimal_luks_sector_size.return_value": 0,
+                         "calculate_luks2_max_memory.return_value": Size("256 MiB")}
+                crypto.configure_mock(**attrs)
+
+                fmt._create()
+                crypto.calculate_luks2_max_memory.assert_not_called()
+                self.assertEqual(bd.luks_format.call_args[1]["extra"].pbkdf.max_memory_kb, 0)
+
+            # fips disabled, pbkdf memory should be set
+            with patch("blivet.formats.luks.crypto") as crypto:
+                attrs = {"is_fips_enabled.return_value": False,
+                         "get_optimal_luks_sector_size.return_value": 0,
+                         "calculate_luks2_max_memory.return_value": Size("256 MiB")}
+                crypto.configure_mock(**attrs)
+
+                fmt._create()
+                crypto.calculate_luks2_max_memory.assert_called()
+                self.assertEqual(bd.luks_format.call_args[1]["extra"].pbkdf.max_memory_kb, 256 * 1024)
+
+     def test_sector_size(self):
+         fmt = LUKS()
+         self.assertEqual(fmt.luks_sector_size, 512)
+diff --git a/tests/unit_tests/formats_tests/methods_test.py b/tests/unit_tests/formats_tests/methods_test.py
+index 2743b7db..5d30c260 100644
+--- a/tests/unit_tests/formats_tests/methods_test.py
+++ b/tests/unit_tests/formats_tests/methods_test.py
+@@ -366,7 +366,8 @@ class LUKSMethodsTestCase(FormatMethodsTestCase):
+ 
+     def _test_create_backend(self):
+         self.format.exists = False
+-        self.format.create()
+        with patch("blivet.devicelibs.crypto.is_fips_enabled", return_value=False):
+            self.format.create()
+         self.assertTrue(self.patches["blockdev"].crypto.luks_format.called)  # pylint: disable=no-member
+ 
+     def _test_setup_backend(self):
+-- 
+2.40.1
+
--- a/SOURCES/0015-Add-support-for-filesystem-online-resize.patch
+++ b/SOURCES/0015-Add-support-for-filesystem-online-resize.patch
@ -0,0 +1,265 @@
+From eb16230427fc1081f8515e6ad69ccf99ca521e5d Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Tue, 4 Apr 2023 13:31:40 +0200
+Subject: [PATCH 1/2] Add support for filesystem online resize
+
+Resolves: rhbz#2168680
+---
+ blivet/devices/lvm.py       | 13 ++++++++-----
+ blivet/devices/partition.py | 11 ++++++-----
+ blivet/flags.py             |  3 +++
+ blivet/formats/fs.py        | 32 ++++++++++++++++++++++++++++----
+ blivet/formats/fslib.py     |  7 +++++++
+ 5 files changed, 52 insertions(+), 14 deletions(-)
+
+diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
+index c3132457..ca45c4b5 100644
+--- a/blivet/devices/lvm.py
+++ b/blivet/devices/lvm.py
+@@ -42,6 +42,7 @@ from .. import errors
+ from .. import util
+ from ..storage_log import log_method_call
+ from .. import udev
+from ..flags import flags
+ from ..size import Size, KiB, MiB, ROUND_UP, ROUND_DOWN
+ from ..static_data.lvm_info import lvs_info
+ from ..tasks import availability
+@@ -2729,12 +2730,14 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+         # Setup VG parents (in case they are dmraid partitions for example)
+         self.vg.setup_parents(orig=True)
+ 
+-        if self.original_format.exists:
+-            self.original_format.teardown()
+-        if self.format.exists:
+-            self.format.teardown()
+        if not flags.allow_online_fs_resize:
+            if self.original_format.exists:
+                self.original_format.teardown()
+            if self.format.exists:
+                self.format.teardown()
+
+            udev.settle()
+ 
+-        udev.settle()
+         blockdev.lvm.lvresize(self.vg.name, self._name, self.size)
+ 
+     @type_specific
+diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py
+index 0e9250ce..6ae4b8d3 100644
+--- a/blivet/devices/partition.py
+++ b/blivet/devices/partition.py
+@@ -745,11 +745,12 @@ class PartitionDevice(StorageDevice):
+         if not self.exists:
+             raise errors.DeviceError("device has not been created")
+ 
+-        # don't teardown when resizing luks
+-        if self.format.type == "luks" and self.children:
+-            self.children[0].format.teardown()
+-        else:
+-            self.teardown()
+        if not flags.allow_online_fs_resize:
+            # don't teardown when resizing luks
+            if self.format.type == "luks" and self.children:
+                self.children[0].format.teardown()
+            else:
+                self.teardown()
+ 
+         if not self.sysfs_path:
+             return
+diff --git a/blivet/flags.py b/blivet/flags.py
+index 6364164d..ecfa7ad7 100644
+--- a/blivet/flags.py
+++ b/blivet/flags.py
+@@ -91,6 +91,9 @@ class Flags(object):
+ 
+         self.debug_threads = False
+ 
+        # Allow online filesystem resizes
+        self.allow_online_fs_resize = False
+
+     def get_boot_cmdline(self):
+         with open("/proc/cmdline") as f:
+             buf = f.read().strip()
+diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
+index 33922f3a..3f553eb0 100644
+--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
+@@ -56,7 +56,7 @@ from ..i18n import N_
+ from .. import udev
+ from ..mounts import mounts_cache
+ 
+-from .fslib import kernel_filesystems
+from .fslib import kernel_filesystems, FSResize
+ 
+ import logging
+ log = logging.getLogger("blivet")
+@@ -88,6 +88,9 @@ class FS(DeviceFormat):
+     # value is already unpredictable and can change in the future...
+     _metadata_size_factor = 1.0
+ 
+    # support for resize: grow/shrink, online/offline
+    _resize_support = 0
+
+     config_actions_map = {"label": "write_label"}
+ 
+     def __init__(self, **kwargs):
+@@ -436,12 +439,27 @@ class FS(DeviceFormat):
+             self.write_uuid()
+ 
+     def _pre_resize(self):
+-        # file systems need a check before being resized
+-        self.do_check()
+        if self.status:
+            if flags.allow_online_fs_resize:
+                if self.target_size > self.size and not self._resize_support & FSResize.ONLINE_GROW:
+                    raise FSError("This filesystem doesn't support online growing")
+                if self.target_size < self.size and not self._resize_support & FSResize.ONLINE_SHRINK:
+                    raise FSError("This filesystem doesn't support online shrinking")
+            else:
+                raise FSError("Resizing of mounted filesystems is disabled")
+
+        if self.status:
+            # fsck tools in general don't allow checks on mounted filesystems
+            log.debug("Filesystem on %s is mounted, not checking", self.device)
+        else:
+            # file systems need a check before being resized
+            self.do_check()
+
+         super(FS, self)._pre_resize()
+ 
+     def _post_resize(self):
+-        self.do_check()
+        if not self.status:
+            self.do_check()
+         super(FS, self)._post_resize()
+ 
+     def do_check(self):
+@@ -838,6 +856,7 @@ class Ext2FS(FS):
+     _formattable = True
+     _supported = True
+     _resizable = True
+    _resize_support = FSResize.ONLINE_GROW | FSResize.OFFLINE_GROW | FSResize.OFFLINE_SHRINK
+     _linux_native = True
+     _max_size = Size("8 TiB")
+     _dump = True
+@@ -1097,6 +1116,7 @@ class XFS(FS):
+     _linux_native = True
+     _supported = True
+     _resizable = True
+    _resize_support = FSResize.ONLINE_GROW | FSResize.OFFLINE_GROW
+     _packages = ["xfsprogs"]
+     _fsck_class = fsck.XFSCK
+     _info_class = fsinfo.XFSInfo
+@@ -1247,6 +1267,7 @@ class NTFS(FS):
+     _labelfs = fslabeling.NTFSLabeling()
+     _uuidfs = fsuuid.NTFSUUID()
+     _resizable = True
+    _resize_support = FSResize.OFFLINE_GROW | FSResize.OFFLINE_SHRINK
+     _formattable = True
+     _supported = True
+     _min_size = Size("1 MiB")
+@@ -1490,6 +1511,9 @@ class TmpFS(NoDevFS):
+         # same, nothing actually needs to be set
+         pass
+ 
+    def _pre_resize(self):
+        self.do_check()
+
+     def do_resize(self):
+         # Override superclass method to record whether mount options
+         # should include an explicit size specification.
+diff --git a/blivet/formats/fslib.py b/blivet/formats/fslib.py
+index ea93b1fd..8722e942 100644
+--- a/blivet/formats/fslib.py
+++ b/blivet/formats/fslib.py
+@@ -36,3 +36,10 @@ def update_kernel_filesystems():
+ 
+ 
+ update_kernel_filesystems()
+
+
+class FSResize():
+    OFFLINE_SHRINK = 1 << 1
+    OFFLINE_GROW = 1 << 2
+    ONLINE_SHRINK = 1 << 3
+    ONLINE_GROW = 1 << 4
+-- 
+2.40.1
+
+
+From 3fce5d0bfd7b09a976ff49feed15077477c6a425 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 6 Apr 2023 14:02:11 +0200
+Subject: [PATCH 2/2] Add a test case for filesystem online resize
+
+Related: rhbz#2168680
+---
+ tests/storage_tests/formats_test/fs_test.py | 43 ++++++++++++++++++++-
+ 1 file changed, 42 insertions(+), 1 deletion(-)
+
+diff --git a/tests/storage_tests/formats_test/fs_test.py b/tests/storage_tests/formats_test/fs_test.py
+index 97f4cbbe..1d42dc21 100644
+--- a/tests/storage_tests/formats_test/fs_test.py
+++ b/tests/storage_tests/formats_test/fs_test.py
+@@ -6,9 +6,10 @@ import parted
+ 
+ import blivet.formats.fs as fs
+ from blivet.size import Size, ROUND_DOWN
+-from blivet.errors import DeviceFormatError
+from blivet.errors import DeviceFormatError, FSError
+ from blivet.formats import get_format
+ from blivet.devices import PartitionDevice, DiskDevice
+from blivet.flags import flags
+ 
+ from .loopbackedtestcase import LoopBackedTestCase
+ 
+@@ -26,6 +27,46 @@ class Ext3FSTestCase(Ext2FSTestCase):
+ class Ext4FSTestCase(Ext3FSTestCase):
+     _fs_class = fs.Ext4FS
+ 
+    def test_online_resize(self):
+        an_fs = self._fs_class()
+        if not an_fs.formattable:
+            self.skipTest("can not create filesystem %s" % an_fs.name)
+        an_fs.device = self.loop_devices[0]
+        self.assertIsNone(an_fs.create())
+        an_fs.update_size_info()
+
+        if not self.can_resize(an_fs):
+            self.skipTest("filesystem is not resizable")
+
+        # shrink offline first (ext doesn't support online shrinking)
+        TARGET_SIZE = Size("64 MiB")
+        an_fs.target_size = TARGET_SIZE
+        self.assertEqual(an_fs.target_size, TARGET_SIZE)
+        self.assertNotEqual(an_fs._size, TARGET_SIZE)
+        self.assertIsNone(an_fs.do_resize())
+
+        with tempfile.TemporaryDirectory() as mountpoint:
+            an_fs.mount(mountpoint=mountpoint)
+
+            # grow back when mounted
+            TARGET_SIZE = Size("100 MiB")
+            an_fs.target_size = TARGET_SIZE
+            self.assertEqual(an_fs.target_size, TARGET_SIZE)
+            self.assertNotEqual(an_fs._size, TARGET_SIZE)
+
+            # should fail, online resize disabled by default
+            with self.assertRaisesRegex(FSError, "Resizing of mounted filesystems is disabled"):
+                an_fs.do_resize()
+
+            # enable online resize
+            flags.allow_online_fs_resize = True
+            an_fs.do_resize()
+            flags.allow_online_fs_resize = False
+            self._test_sizes(an_fs)
+            self.assertEqual(an_fs.system_mountpoint, mountpoint)
+
+            an_fs.unmount()
+
+ 
+ class FATFSTestCase(fstesting.FSAsRoot):
+     _fs_class = fs.FATFS
+-- 
+2.40.1
+
--- a/SOURCES/0016-Backport-iSCSI-initiator-name-related-fixes.patch
+++ b/SOURCES/0016-Backport-iSCSI-initiator-name-related-fixes.patch
@ -0,0 +1,382 @@
+From d06c45db59d0e917dbab4c283f2f04c8f9206a6e Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 6 Mar 2023 10:51:42 +0100
+Subject: [PATCH 1/5] Allow changing iSCSI initiator name after setting it
+
+Resolves: rhbz#2083139
+---
+ blivet/iscsi.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/blivet/iscsi.py b/blivet/iscsi.py
+index 86451db3..0d063f2a 100644
+--- a/blivet/iscsi.py
+++ b/blivet/iscsi.py
+@@ -212,14 +212,23 @@ class iSCSI(object):
+     @initiator.setter
+     @storaged_iscsi_required(critical=True, eval_mode=util.EvalMode.onetime)
+     def initiator(self, val):
+-        if self.initiator_set and val != self._initiator:
+-            raise ValueError(_("Unable to change iSCSI initiator name once set"))
+         if len(val) == 0:
+             raise ValueError(_("Must provide an iSCSI initiator name"))
+ 
+        active = self._get_active_sessions()
+        if active:
+            raise errors.ISCSIError(_("Cannot change initiator name with an active session"))
+
+         log.info("Setting up iSCSI initiator name %s", self.initiator)
+         args = GLib.Variant("(sa{sv})", (val, None))
+         self._call_initiator_method("SetInitiatorName", args)
+
+        if self.initiator_set and val != self._initiator:
+            log.info("Restarting iscsid after initiator name change")
+            rc = util.run_program(["systemctl", "restart", "iscsid"])
+            if rc != 0:
+                raise errors.ISCSIError(_("Failed to restart iscsid after initiator name change"))
+
+         self._initiator = val
+ 
+     def active_nodes(self, target=None):
+-- 
+2.40.1
+
+
+From b71991d65c270c023364b03c499b4bf3e245fbd0 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 6 Mar 2023 15:10:28 +0100
+Subject: [PATCH 2/5] Add a basic test case for the iscsi module
+
+Related: rhbz#2083139
+---
+ tests/storage_tests/__init__.py    |   2 +
+ tests/storage_tests/iscsi_test.py  | 157 +++++++++++++++++++++++++++++
+ 3 files changed, 162 insertions(+)
+ create mode 100644 tests/storage_tests/iscsi_test.py
+
+diff --git a/tests/storage_tests/__init__.py b/tests/storage_tests/__init__.py
+index 3b2a6cc4..e69fcc34 100644
+--- a/tests/storage_tests/__init__.py
+++ b/tests/storage_tests/__init__.py
+@@ -3,3 +3,5 @@ from .formats_test import *
+ 
+ from .partitioning_test import *
+ from .unsupported_disklabel_test import *
+
+from .iscsi_test import *
+diff --git a/tests/storage_tests/iscsi_test.py b/tests/storage_tests/iscsi_test.py
+new file mode 100644
+index 00000000..00cc7c36
+--- /dev/null
+++ b/tests/storage_tests/iscsi_test.py
+@@ -0,0 +1,157 @@
+import glob
+import os
+import re
+import shutil
+import subprocess
+import unittest
+
+from contextlib import contextmanager
+
+from .storagetestcase import create_sparse_tempfile
+
+
+def read_file(filename, mode="r"):
+    with open(filename, mode) as f:
+        content = f.read()
+    return content
+
+
+@contextmanager
+def udev_settle():
+    try:
+        yield
+    finally:
+        os.system("udevadm settle")
+
+
+def _delete_backstore(name):
+    status = subprocess.call(["targetcli", "/backstores/fileio/ delete %s" % name],
+                             stdout=subprocess.DEVNULL)
+    if status != 0:
+        raise RuntimeError("Failed to delete the '%s' fileio backstore" % name)
+
+
+def delete_iscsi_target(iqn, backstore=None):
+    status = subprocess.call(["targetcli", "/iscsi delete %s" % iqn],
+                             stdout=subprocess.DEVNULL)
+    if status != 0:
+        raise RuntimeError("Failed to delete the '%s' iscsi device" % iqn)
+
+    if backstore is not None:
+        _delete_backstore(backstore)
+
+
+def create_iscsi_target(fpath, initiator_name=None):
+    """
+    Creates a new iSCSI target (using targetcli) on top of the
+    :param:`fpath` backing file.
+
+    :param str fpath: path of the backing file
+    :returns: iSCSI IQN, backstore name
+    :rtype: tuple of str
+
+    """
+
+    # "register" the backing file as a fileio backstore
+    store_name = os.path.basename(fpath)
+    status = subprocess.call(["targetcli", "/backstores/fileio/ create %s %s" % (store_name, fpath)], stdout=subprocess.DEVNULL)
+    if status != 0:
+        raise RuntimeError("Failed to register '%s' as a fileio backstore" % fpath)
+
+    out = subprocess.check_output(["targetcli", "/backstores/fileio/%s info" % store_name])
+    out = out.decode("utf-8")
+    store_wwn = None
+    for line in out.splitlines():
+        if line.startswith("wwn: "):
+            store_wwn = line[5:]
+    if store_wwn is None:
+        raise RuntimeError("Failed to determine '%s' backstore's wwn" % store_name)
+
+    # create a new iscsi device
+    out = subprocess.check_output(["targetcli", "/iscsi create"])
+    out = out.decode("utf-8")
+    match = re.match(r'Created target (.*).', out)
+    if match:
+        iqn = match.groups()[0]
+    else:
+        _delete_backstore(store_name)
+        raise RuntimeError("Failed to create a new iscsi target")
+
+    if initiator_name:
+        status = subprocess.call(["targetcli", "/iscsi/%s/tpg1/acls create %s" % (iqn, initiator_name)], stdout=subprocess.DEVNULL)
+        if status != 0:
+            delete_iscsi_target(iqn, store_name)
+            raise RuntimeError("Failed to set ACLs for '%s'" % iqn)
+
+    with udev_settle():
+        status = subprocess.call(["targetcli", "/iscsi/%s/tpg1/luns create /backstores/fileio/%s" % (iqn, store_name)], stdout=subprocess.DEVNULL)
+    if status != 0:
+        delete_iscsi_target(iqn, store_name)
+        raise RuntimeError("Failed to create a new LUN for '%s' using '%s'" % (iqn, store_name))
+
+    status = subprocess.call(["targetcli", "/iscsi/%s/tpg1 set attribute generate_node_acls=1" % iqn], stdout=subprocess.DEVNULL)
+    if status != 0:
+        raise RuntimeError("Failed to set ACLs for '%s'" % iqn)
+
+    return iqn, store_name
+
+
+@unittest.skipUnless(os.geteuid() == 0, "requires root privileges")
+@unittest.skipUnless(os.environ.get("JENKINS_HOME"), "jenkins only test")
+@unittest.skipUnless(shutil.which("iscsiadm"), "iscsiadm not available")
+class ISCSITestCase(unittest.TestCase):
+
+    _disk_size = 512 * 1024**2
+    initiator = 'iqn.1994-05.com.redhat:iscsi-test'
+
+    def setUp(self):
+        self.addCleanup(self._clean_up)
+
+        self._dev_file = None
+        self.dev = None
+
+        self._dev_file = create_sparse_tempfile("blivet_test", self._disk_size)
+        try:
+            self.dev, self.backstore = create_iscsi_target(self._dev_file, self.initiator)
+        except RuntimeError as e:
+            raise RuntimeError("Failed to setup targetcli device for testing: %s" % e)
+
+    def _force_logout(self):
+        subprocess.call(["iscsiadm", "--mode", "node", "--logout", "--name", self.dev], stdout=subprocess.DEVNULL)
+
+    def _clean_up(self):
+        self._force_logout()
+        delete_iscsi_target(self.dev, self.backstore)
+        os.unlink(self._dev_file)
+
+    def test_discover_login(self):
+        from blivet.iscsi import iscsi, has_iscsi
+
+        if not has_iscsi():
+            self.skipTest("iSCSI not available, skipping")
+
+        iscsi.initiator = self.initiator
+        nodes = iscsi.discover("127.0.0.1")
+        self.assertTrue(nodes)
+
+        if len(nodes) > 1:
+            self.skipTest("Discovered more than one iSCSI target on localhost, skipping")
+
+        self.assertEqual(nodes[0].address, "127.0.0.1")
+        self.assertEqual(nodes[0].port, 3260)
+        self.assertEqual(nodes[0].name, self.dev)
+
+        # change the initiator name
+        iscsi.initiator = self.initiator + "_1"
+        self.assertEqual(iscsi.initiator, self.initiator + "_1")
+
+        # try to login
+        ret, err = iscsi.log_into_node(nodes[0])
+        self.assertTrue(ret, "Login failed: %s" % err)
+
+        # check the session for initiator name
+        sessions = glob.glob("/sys/class/iscsi_session/*/")
+        self.assertTrue(sessions)
+        self.assertEqual(len(sessions), 1)
+        initiator = read_file(sessions[0] + "initiatorname").strip()
+        self.assertEqual(initiator, iscsi.initiator)
+-- 
+2.40.1
+
+
+From 65e8150a7404e37dd2740841a88e7f2565836406 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 6 Mar 2023 15:14:40 +0100
+Subject: [PATCH 3/5] tests: Use blivet-specific prefix for targetcli backing
+ files
+
+The code is originally from libblockdev hence the "bd" prefix, we
+should use a different prefix for blivet to be able to identify
+which test suite failed to clean the files.
+
+Related: rhbz#2083139
+---
+ tests/storage_tests/storagetestcase.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/storage_tests/storagetestcase.py b/tests/storage_tests/storagetestcase.py
+index 35d57ce9..9f859977 100644
+--- a/tests/storage_tests/storagetestcase.py
+++ b/tests/storage_tests/storagetestcase.py
+@@ -39,7 +39,7 @@ def create_sparse_tempfile(name, size):
+         :param size: the file size (in bytes)
+         :returns: the path to the newly created file
+     """
+-    (fd, path) = tempfile.mkstemp(prefix="bd.", suffix="-%s" % name)
+    (fd, path) = tempfile.mkstemp(prefix="blivet.", suffix="-%s" % name)
+     os.close(fd)
+     create_sparse_file(path, size)
+     return path
+-- 
+2.40.1
+
+
+From 41278ef1b3f949303fd30fff2ccdde75f713c9f8 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 19 Jul 2023 13:57:39 +0200
+Subject: [PATCH 4/5] iscsi: Save firmware initiator name to
+ /etc/iscsi/initiatorname.iscsi
+
+Resolves: rhbz#2084043
+---
+ blivet/iscsi.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/blivet/iscsi.py b/blivet/iscsi.py
+index 0d063f2a..8080a671 100644
+--- a/blivet/iscsi.py
+++ b/blivet/iscsi.py
+@@ -160,6 +160,11 @@ class iSCSI(object):
+                 self._initiator = initiatorname
+             except Exception as e:  # pylint: disable=broad-except
+                 log.info("failed to get initiator name from iscsi firmware: %s", str(e))
+            else:
+                # write the firmware initiator to /etc/iscsi/initiatorname.iscsi
+                log.info("Setting up firmware iSCSI initiator name %s", self.initiator)
+                args = GLib.Variant("(sa{sv})", (initiatorname, None))
+                self._call_initiator_method("SetInitiatorName", args)
+ 
+     # So that users can write iscsi() to get the singleton instance
+     def __call__(self):
+-- 
+2.40.1
+
+
+From fce8b73965d968aab546bc7e0ecb65d1995da46f Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 19 Jul 2023 10:38:45 +0200
+Subject: [PATCH 5/5] tests: Improve iscsi_test.ISCSITestCase
+
+Changed how we create the initiator name ACLs based on RTT test
+case for rhbz#2084043 and also improved the test case itself.
+
+Related: rhbz#2083139
+---
+ tests/storage_tests/iscsi_test.py | 36 +++++++++++++++++++++----------
+ 1 file changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/tests/storage_tests/iscsi_test.py b/tests/storage_tests/iscsi_test.py
+index 00cc7c36..6cc83a59 100644
+--- a/tests/storage_tests/iscsi_test.py
+++ b/tests/storage_tests/iscsi_test.py
+@@ -77,21 +77,17 @@ def create_iscsi_target(fpath, initiator_name=None):
+         _delete_backstore(store_name)
+         raise RuntimeError("Failed to create a new iscsi target")
+ 
+-    if initiator_name:
+-        status = subprocess.call(["targetcli", "/iscsi/%s/tpg1/acls create %s" % (iqn, initiator_name)], stdout=subprocess.DEVNULL)
+-        if status != 0:
+-            delete_iscsi_target(iqn, store_name)
+-            raise RuntimeError("Failed to set ACLs for '%s'" % iqn)
+-
+     with udev_settle():
+         status = subprocess.call(["targetcli", "/iscsi/%s/tpg1/luns create /backstores/fileio/%s" % (iqn, store_name)], stdout=subprocess.DEVNULL)
+     if status != 0:
+         delete_iscsi_target(iqn, store_name)
+         raise RuntimeError("Failed to create a new LUN for '%s' using '%s'" % (iqn, store_name))
+ 
+-    status = subprocess.call(["targetcli", "/iscsi/%s/tpg1 set attribute generate_node_acls=1" % iqn], stdout=subprocess.DEVNULL)
+-    if status != 0:
+-        raise RuntimeError("Failed to set ACLs for '%s'" % iqn)
+    if initiator_name:
+        status = subprocess.call(["targetcli", "/iscsi/%s/tpg1/acls create %s" % (iqn, initiator_name)], stdout=subprocess.DEVNULL)
+        if status != 0:
+            delete_iscsi_target(iqn, store_name)
+            raise RuntimeError("Failed to set ACLs for '%s'" % iqn)
+ 
+     return iqn, store_name
+ 
+@@ -130,6 +126,7 @@ class ISCSITestCase(unittest.TestCase):
+         if not has_iscsi():
+             self.skipTest("iSCSI not available, skipping")
+ 
+        # initially set the initiator to the correct/allowed one
+         iscsi.initiator = self.initiator
+         nodes = iscsi.discover("127.0.0.1")
+         self.assertTrue(nodes)
+@@ -141,11 +138,28 @@ class ISCSITestCase(unittest.TestCase):
+         self.assertEqual(nodes[0].port, 3260)
+         self.assertEqual(nodes[0].name, self.dev)
+ 
+-        # change the initiator name
+        # change the initiator name to a wrong one
+         iscsi.initiator = self.initiator + "_1"
+         self.assertEqual(iscsi.initiator, self.initiator + "_1")
+ 
+-        # try to login
+        # check the change made it to /etc/iscsi/initiatorname.iscsi
+        initiator_file = read_file("/etc/iscsi/initiatorname.iscsi").strip()
+        self.assertEqual(initiator_file, "InitiatorName=%s" % self.initiator + "_1")
+
+        # try to login (should fail)
+        ret, err = iscsi.log_into_node(nodes[0])
+        self.assertFalse(ret)
+        self.assertIn("authorization failure", err)
+
+        # change the initiator name back to the correct one
+        iscsi.initiator = self.initiator
+        self.assertEqual(iscsi.initiator, self.initiator)
+
+        # check the change made it to /etc/iscsi/initiatorname.iscsi
+        initiator_file = read_file("/etc/iscsi/initiatorname.iscsi").strip()
+        self.assertEqual(initiator_file, "InitiatorName=%s" % self.initiator)
+
+        # try to login (should work now)
+         ret, err = iscsi.log_into_node(nodes[0])
+         self.assertTrue(ret, "Login failed: %s" % err)
+ 
+-- 
+2.40.1
+
--- a/SOURCES/0017-Add-support-for-creating-shared-LVM-setups.patch
+++ b/SOURCES/0017-Add-support-for-creating-shared-LVM-setups.patch
@ -0,0 +1,206 @@
+From faef0408d2f7c61aade6d187389c61e64f9f373b Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 20 Apr 2023 12:35:30 +0200
+Subject: [PATCH] Add support for creating shared LVM setups
+
+This feature is requested by GFS2 for the storage role. This adds
+support for creating shared VGs and activating LVs in shared mode.
+
+Resolves: RHEL-14021
+---
+ blivet/devices/lvm.py                     | 44 +++++++++++++++++++----
+ blivet/tasks/availability.py              |  9 +++++
+ tests/unit_tests/devices_test/lvm_test.py | 25 +++++++++++++
+ 3 files changed, 72 insertions(+), 6 deletions(-)
+
+diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
+index ca45c4b5..068c5368 100644
+--- a/blivet/devices/lvm.py
+++ b/blivet/devices/lvm.py
+@@ -97,7 +97,8 @@ class LVMVolumeGroupDevice(ContainerDevice):
+ 
+     def __init__(self, name, parents=None, size=None, free=None,
+                  pe_size=None, pe_count=None, pe_free=None, pv_count=None,
+-                 uuid=None, exists=False, sysfs_path='', exported=False):
+                 uuid=None, exists=False, sysfs_path='', exported=False,
+                 shared=False):
+         """
+             :param name: the device name (generally a device node's basename)
+             :type name: str
+@@ -124,6 +125,11 @@ class LVMVolumeGroupDevice(ContainerDevice):
+             :type pv_count: int
+             :keyword uuid: the VG UUID
+             :type uuid: str
+
+            For non-existing VGs only:
+
+            :keyword shared: whether to create this VG as shared
+            :type shared: bool
+         """
+         # These attributes are used by _add_parent, so they must be initialized
+         # prior to instantiating the superclass.
+@@ -137,6 +143,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
+         self.pe_count = util.numeric_type(pe_count)
+         self.pe_free = util.numeric_type(pe_free)
+         self.exported = exported
+        self._shared = shared
+ 
+         # TODO: validate pe_size if given
+         if not self.pe_size:
+@@ -254,7 +261,19 @@ class LVMVolumeGroupDevice(ContainerDevice):
+         """ Create the device. """
+         log_method_call(self, self.name, status=self.status)
+         pv_list = [pv.path for pv in self.parents]
+-        blockdev.lvm.vgcreate(self.name, pv_list, self.pe_size)
+        extra = dict()
+        if self._shared:
+            extra["shared"] = ""
+        blockdev.lvm.vgcreate(self.name, pv_list, self.pe_size, **extra)
+
+        if self._shared:
+            if availability.BLOCKDEV_LVM_PLUGIN_SHARED.available:
+                try:
+                    blockdev.lvm.vglock_start(self.name)
+                except blockdev.LVMError as err:
+                    raise errors.LVMError(err)
+            else:
+                raise errors.LVMError("Shared LVM is not fully supported: %s" % ",".join(availability.BLOCKDEV_LVM_PLUGIN_SHARED.availability_errors))
+ 
+     def _post_create(self):
+         self._complete = True
+@@ -661,7 +680,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+     def __init__(self, name, parents=None, size=None, uuid=None, seg_type=None,
+                  fmt=None, exists=False, sysfs_path='', grow=None, maxsize=None,
+                  percent=None, cache_request=None, pvs=None, from_lvs=None,
+-                 stripe_size=0):
+                 stripe_size=0, shared=False):
+ 
+         if not exists:
+             if seg_type not in [None, "linear", "thin", "thin-pool", "cache", "vdo-pool", "vdo", "cache-pool"] + lvm.raid_seg_types:
+@@ -690,6 +709,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
+         self.seg_type = seg_type or "linear"
+         self._raid_level = None
+         self.ignore_skip_activation = 0
+        self._shared = shared
+ 
+         self.req_grow = None
+         self.req_max_size = Size(0)
+@@ -2306,7 +2326,8 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+                  parent_lv=None, int_type=None, origin=None, vorigin=False,
+                  metadata_size=None, chunk_size=None, profile=None, from_lvs=None,
+                  compression=False, deduplication=False, index_memory=0,
+-                 write_policy=None, cache_mode=None, attach_to=None, stripe_size=0):
+                 write_policy=None, cache_mode=None, attach_to=None, stripe_size=0,
+                 shared=False):
+         """
+             :param name: the device name (generally a device node's basename)
+             :type name: str
+@@ -2337,6 +2358,8 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+             :type cache_request: :class:`~.devices.lvm.LVMCacheRequest`
+             :keyword pvs: list of PVs to allocate extents from (size could be specified for each PV)
+             :type pvs: list of :class:`~.devices.StorageDevice` or :class:`LVPVSpec` objects (tuples)
+            :keyword shared: whether to activate the newly create LV in shared mode
+            :type shared: bool
+ 
+             For internal LVs only:
+ 
+@@ -2412,7 +2435,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+         LVMLogicalVolumeBase.__init__(self, name, parents, size, uuid, seg_type,
+                                       fmt, exists, sysfs_path, grow, maxsize,
+                                       percent, cache_request, pvs, from_lvs,
+-                                      stripe_size)
+                                      stripe_size, shared)
+         LVMVDOPoolMixin.__init__(self, compression, deduplication, index_memory,
+                                  write_policy)
+         LVMVDOLogicalVolumeMixin.__init__(self)
+@@ -2634,7 +2657,13 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+         log_method_call(self, self.name, orig=orig, status=self.status,
+                         controllable=self.controllable)
+         ignore_skip_activation = self.is_snapshot_lv or self.ignore_skip_activation > 0
+-        blockdev.lvm.lvactivate(self.vg.name, self._name, ignore_skip=ignore_skip_activation)
+        if self._shared:
+            if availability.BLOCKDEV_LVM_PLUGIN_SHARED.available:
+                blockdev.lvm.lvactivate(self.vg.name, self._name, ignore_skip=ignore_skip_activation, shared=True)
+            else:
+                raise errors.LVMError("Shared LVM is not fully supported: %s" % ",".join(availability.BLOCKDEV_LVM_PLUGIN_SHARED.availability_errors))
+        else:
+            blockdev.lvm.lvactivate(self.vg.name, self._name, ignore_skip=ignore_skip_activation)
+ 
+     @type_specific
+     def _pre_create(self):
+@@ -2672,6 +2701,9 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+             if self._stripe_size:
+                 extra["stripesize"] = str(int(self._stripe_size.convert_to("KiB")))
+ 
+            if self._shared:
+                extra["activate"] = "sy"
+
+             blockdev.lvm.lvcreate(self.vg.name, self._name, self.size,
+                                   type=self.seg_type, pv_list=pvs, **extra)
+         else:
+diff --git a/blivet/tasks/availability.py b/blivet/tasks/availability.py
+index bba1ba84..85945c77 100644
+--- a/blivet/tasks/availability.py
+++ b/blivet/tasks/availability.py
+@@ -435,6 +435,14 @@ if hasattr(blockdev.LVMTech, "VDO"):
+ else:
+     BLOCKDEV_LVM_TECH_VDO = _UnavailableMethod(error_msg="Installed version of libblockdev doesn't support LVM VDO technology")
+ 
+if hasattr(blockdev.LVMTech, "SHARED"):
+    BLOCKDEV_LVM_SHARED = BlockDevTechInfo(plugin_name="lvm",
+                                           check_fn=blockdev.lvm_is_tech_avail,
+                                           technologies={blockdev.LVMTech.SHARED: blockdev.LVMTechMode.MODIFY})  # pylint: disable=no-member
+    BLOCKDEV_LVM_TECH_SHARED = BlockDevMethod(BLOCKDEV_LVM_SHARED)
+else:
+    BLOCKDEV_LVM_TECH_SHARED = _UnavailableMethod(error_msg="Installed version of libblockdev doesn't support shared LVM technology")
+
+ # libblockdev mdraid plugin required technologies and modes
+ BLOCKDEV_MD_ALL_MODES = (blockdev.MDTechMode.CREATE |
+                          blockdev.MDTechMode.DELETE |
+@@ -476,6 +484,7 @@ BLOCKDEV_DM_PLUGIN_RAID = blockdev_plugin("libblockdev dm plugin (raid technolog
+ BLOCKDEV_LOOP_PLUGIN = blockdev_plugin("libblockdev loop plugin", BLOCKDEV_LOOP_TECH)
+ BLOCKDEV_LVM_PLUGIN = blockdev_plugin("libblockdev lvm plugin", BLOCKDEV_LVM_TECH)
+ BLOCKDEV_LVM_PLUGIN_VDO = blockdev_plugin("libblockdev lvm plugin (vdo technology)", BLOCKDEV_LVM_TECH_VDO)
+BLOCKDEV_LVM_PLUGIN_SHARED = blockdev_plugin("libblockdev lvm plugin (shared LVM technology)", BLOCKDEV_LVM_TECH_SHARED)
+ BLOCKDEV_MDRAID_PLUGIN = blockdev_plugin("libblockdev mdraid plugin", BLOCKDEV_MD_TECH)
+ BLOCKDEV_MPATH_PLUGIN = blockdev_plugin("libblockdev mpath plugin", BLOCKDEV_MPATH_TECH)
+ BLOCKDEV_SWAP_PLUGIN = blockdev_plugin("libblockdev swap plugin", BLOCKDEV_SWAP_TECH)
+diff --git a/tests/unit_tests/devices_test/lvm_test.py b/tests/unit_tests/devices_test/lvm_test.py
+index d7b55224..e645309f 100644
+--- a/tests/unit_tests/devices_test/lvm_test.py
+++ b/tests/unit_tests/devices_test/lvm_test.py
+@@ -476,6 +476,31 @@ class LVMDeviceTest(unittest.TestCase):
+                 lv.setup()
+                 lvm.lvactivate.assert_called_with(vg.name, lv.lvname, ignore_skip=False)
+ 
+    @patch("blivet.tasks.availability.BLOCKDEV_LVM_PLUGIN_SHARED",
+           new=blivet.tasks.availability.ExternalResource(blivet.tasks.availability.AvailableMethod, ""))
+    def test_lv_activate_shared(self):
+        pv = StorageDevice("pv1", fmt=blivet.formats.get_format("lvmpv"),
+                           size=Size("1 GiB"), exists=True)
+        vg = LVMVolumeGroupDevice("testvg", parents=[pv], exists=True)
+        lv = LVMLogicalVolumeDevice("data_lv", parents=[vg], size=Size("500 MiB"), exists=True, shared=True)
+
+        with patch("blivet.devices.lvm.blockdev.lvm") as lvm:
+            with patch.object(lv, "_pre_setup"):
+                lv.setup()
+                lvm.lvactivate.assert_called_with(vg.name, lv.lvname, ignore_skip=False, shared=True)
+
+    @patch("blivet.tasks.availability.BLOCKDEV_LVM_PLUGIN_SHARED",
+           new=blivet.tasks.availability.ExternalResource(blivet.tasks.availability.AvailableMethod, ""))
+    def test_vg_create_shared(self):
+        pv = StorageDevice("pv1", fmt=blivet.formats.get_format("lvmpv"),
+                           size=Size("1 GiB"), exists=True)
+        vg = LVMVolumeGroupDevice("testvg", parents=[pv], shared=True)
+
+        with patch("blivet.devices.lvm.blockdev.lvm") as lvm:
+            vg._create()
+            lvm.vgcreate.assert_called_with(vg.name, [pv.path], Size("4 MiB"), shared="")
+            lvm.vglock_start.assert_called_with(vg.name)
+
+     def test_vg_is_empty(self):
+         pv = StorageDevice("pv1", fmt=blivet.formats.get_format("lvmpv"),
+                            size=Size("1024 MiB"))
+-- 
+2.41.0
+
--- a/SPECS/python-blivet.spec
+++ b/SPECS/python-blivet.spec
@ -19,11 +19,11 @@
 Summary:  A python module for system storage configuration
 Name: python-blivet
 Url: https://storageapis.wordpress.com/projects/blivet
-Version: 3.4.0
+Version: 3.6.0

 #%%global prerelease .b2
 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
-Release: 6%{?prerelease}%{?dist}
+Release: 8%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPLv2+
 %global realname blivet
@ -34,11 +34,19 @@ Patch0: 0001-force-lvm-cli.plugin
 Patch1: 0002-remove-btrfs-plugin.patch
 Patch2: 0003-Revert-More-consistent-lvm-errors.patch
 Patch3: 0004-Revert-Terminology-cleanups.patch
-Patch4: 0005-Fix-activating-old-style-LVM-snapshots.patch
-Patch5: 0006-Fix-resolving-devices-with-names-that-look-like-BIOS.patch
-Patch6: 0007-Do-not-set-chunk-size-for-RAID1.patch
-Patch7: 0008-Fix-running-tests-in-gating.patch
-Patch8: 0009-PO-update.patch
+Patch4: 0005-DDF-RAID-support-using-mdadm.patch
+Patch5: 0006-Revert-Remove-the-Blivet.roots-attribute.patch
+Patch6: 0007-Fix-potential-AttributeError-when-getting-stratis-bl.patch
+Patch7: 0008-tests-Skip-XFS-resize-test-on-CentOS-RHEL-8.patch
+Patch8: 0009-Revert-Adjust-to-new-XFS-min-size.patch
+Patch9: 0010-Catch-BlockDevNotImplementedError-for-btrfs-plugin-c.patch
+Patch10: 0011-Default-to-encryption-sector-size-512-for-LUKS-devic.patch
+Patch11: 0012-Add-support-for-specifying-stripe-size-for-RAID-LVs.patch
+Patch12: 0013-Fix-setting-kickstart-data.patch
+Patch13: 0014-Do-not-set-memory-limit-for-LUKS2-when-running-in-FI.patch
+Patch14: 0015-Add-support-for-filesystem-online-resize.patch
+Patch15: 0016-Backport-iSCSI-initiator-name-related-fixes.patch
+Patch16: 0017-Add-support-for-creating-shared-LVM-setups.patch

 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@ -201,9 +209,96 @@ configuration.
 %endif

 %changelog
-* Mon Sep 13 2021 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-6
- Localization update for 8.5
-  Resolves: rhbz#1962016
+* Mon Oct 30 2023 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-8
+- Add support for creating shared LVM setups
+  Resolves: RHEL-14021
+
+* Mon Jul 24 2023 Jan Pokorny <japokorn@redhat.com> - 3.6.0-7
+Backport iSCSI initiator name related fixes:
+- Allow changing iSCSI initiator name after setting it
+  Resolves: rhbz#2083139
+- Add a basic test case for the iscsi module
+  Related: rhbz#2083139
+- tests: Use blivet-specific prefix for targetcli backing files
+  Related: rhbz#2083139
+- iscsi: Save firmware initiator name to /etc/iscsi/initiatorname.iscsi
+  Resolves: rhbz#2084043
+- tests: Improve iscsi_test.ISCSITestCase
+  Related: rhbz#2083139
+
+* Thu May 18 2023 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-6
+- Fix setting kickstart data
+  Resolves: rhbz#2175166
+- Do not set memory limit for LUKS2 when running in FIPS mode
+  Resolves: rhbz#2183437
+- Add support for filesystem online resize
+  Resolves: rhbz#2168680
+
+* Tue May 02 2023 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-5
+- Add support for specifying stripe size for RAID LVs
+  Resolves: rhbz#2142550
+
+* Thu Jan 19 2023 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-4
+- Default to encryption sector size 512 for LUKS devices
+  Resolves: rhbz#2160465
+
+* Thu Nov 03 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-3
+- Catch BlockDevNotImplementedError for btrfs plugin calls
+  Resolves: rhbz#2139169
+- Revert "Adjust to new XFS min size"
+  Resolves: rhbz#2139187
+
+* Fri Oct 21 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-2
+- Skip XFS resize test on CentOS/RHEL 8
+  Related: rhbz#2123712
+
+* Fri Oct 21 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-1
+- Rebase to the latest upstream release 3.6.0
+  Resolves: rhbz#2123712
+
+* Thu Aug 18 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-13
+- DDF RAID support using mdadm
+  Resolves: rhbz#2063791
+
+* Mon Jun 20 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-12
+- Add support for NPIV-enabled zFCP devices
+  Resolves: rhbz#1497087
+
+* Thu Jun 02 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-11
+- Fix running gating tests on AWS/Xen machines
+  Resolves: rhbz#2093207
+
+* Thu Jun 02 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-10
+- Fix getting PV info in LVMPhysicalVolume from the cache
+  Resolves: rhbz#2079220
+- Do not crash when changing disklabel on disks with active devices
+  Resolves: rhbz#2078801
+- ActionDestroyDevice should not obsolete ActionRemoveMember
+  Resolves: rhbz#2076958
+- Correctly set vg_name after adding/removing a PV from a VG
+  Resolves: rhbz#2081276
+- Use LVM PV format current_size in LVMVolumeGroupDevice._remove
+  Related: rhbz#2081276
+- Add support for creating LVM cache pools
+  Resolves: rhbz#2055198
+
+* Mon Jan 10 2022 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-9
+- Translation update
+  Resolves: rhbz#2003050
+
+* Tue Dec 14 2021 ojtech Trefny <vtrefny@redhat.com> - 3.4.0-8
+- Replace all log_exception_info calls with log.info
+  Resolves: rhbz#2028134
+
+* Fri Nov 26 2021 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-7
+- Release number bump
+  Related: rhbz#1988276
+
+* Fri Nov 26 2021 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-6
+- Improve error message printed for missing dependecies
+  Resolves: rhbz#1988276
+- Use bigger chunk size for thinpools bigger than ~15.88 TiB
+  Resolves: rhbz#1949953

 * Wed Aug 4 2021 Vojtech Trefny <vtrefny@redhat.com> - 3.4.0-5
 - Fix running upstream test suite in gating