diff --git a/0001-Fix-name-resolution-for-md-member-partitions.patch b/0001-Fix-name-resolution-for-md-member-partitions.patch deleted file mode 100644 index 8c643b9..0000000 --- a/0001-Fix-name-resolution-for-md-member-partitions.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 97cdeb7ba3db01bcd510b35a44b21549703fe545 Mon Sep 17 00:00:00 2001 -From: David Lehman -Date: Tue, 30 Apr 2019 12:49:39 -0400 -Subject: [PATCH] Fix name resolution for md member partitions. (#1798792) - ---- - blivet/udev.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/udev.py b/blivet/udev.py -index 5063e733..7ebdbcb9 100644 ---- a/blivet/udev.py -+++ b/blivet/udev.py -@@ -202,7 +202,7 @@ def device_get_name(udev_info): - """ Return the best name for a device based on the udev db data. """ - if "DM_NAME" in udev_info: - name = udev_info["DM_NAME"] -- elif "MD_DEVNAME" in udev_info: -+ elif "MD_DEVNAME" in udev_info and os.path.exists(device_get_sysfs_path(udev_info) + "/md"): - mdname = udev_info["MD_DEVNAME"] - if device_is_partition(udev_info): - # for partitions on named RAID we want to use the raid name, not diff --git a/0001-Invalidate-LVM-caches-in-blivet-device-discovery-loop.patch b/0001-Invalidate-LVM-caches-in-blivet-device-discovery-loop.patch deleted file mode 100644 index 102f46e..0000000 --- a/0001-Invalidate-LVM-caches-in-blivet-device-discovery-loop.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 394ff40554ab8b3ce9ff0aa5af0c8c2ead6522a3 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 20 Apr 2020 11:01:10 -0700 -Subject: [PATCH] Invalidate LVM caches in blivet device discovery loop - (#1824418) - -This should work around a problem where we sometimes fail to -correctly evaluate existing logical volumes, though it is not a -correct fix for the underlying problem (which we haven't exactly -identified yet) but a workaround for Fedora 32 release. - -Signed-off-by: Adam Williamson ---- - blivet/populator/populator.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/blivet/populator/populator.py b/blivet/populator/populator.py -index 465c272d..3e1d16f3 100644 ---- a/blivet/populator/populator.py -+++ b/blivet/populator/populator.py -@@ -24,6 +24,7 @@ import os - import pprint - import copy - import parted -+import time - from six import add_metaclass - - import gi -@@ -454,6 +455,9 @@ class PopulatorMixin(object): - callbacks.populate_started(n_devices=n_devices) - report = False - -+ time.sleep(2) -+ self.drop_lvm_cache() -+ mpath_members.drop_cache() - log.info("devices to scan: %s", [udev.device_get_name(d) for d in devices]) - for dev in devices: - self.handle_device(dev) --- -2.26.1 - diff --git a/0001-initial-PowerNV-class-support.patch b/0001-initial-PowerNV-class-support.patch deleted file mode 100644 index 7d0ad25..0000000 --- a/0001-initial-PowerNV-class-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fcc941289541a6667445b4c2104b697933b867e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 7 Jun 2019 09:31:01 +0200 -Subject: [PATCH] initial PowerNV class support - ---- - blivet/arch.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/blivet/arch.py b/blivet/arch.py -index 55ce8108..2cd978e9 100644 ---- a/blivet/arch.py -+++ b/blivet/arch.py -@@ -72,7 +72,7 @@ def get_ppc_machine(): - 'Cell': 'pSeries', - 'Momentum': 'pSeries', - 'PS3': 'PS3', -- 'PowerNV': 'pSeries' -+ 'PowerNV': 'PowerNV' - } - machine = None - platform = None -@@ -330,6 +330,10 @@ def is_ipseries(): - return is_ppc() and get_ppc_machine() in ("iSeries", "pSeries") - - -+def is_powernv(): -+ return is_ppc() and get_ppc_machine() == "PowerNV" -+ -+ - def get_arch(): - """ - :return: The hardware architecture diff --git a/0001-set-allowed-disk-labels-for-s390x.patch b/0001-set-allowed-disk-labels-for-s390x.patch deleted file mode 100644 index 931fca0..0000000 --- a/0001-set-allowed-disk-labels-for-s390x.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 462099a9137fb7997140360c07665a21615a0fea Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Tue, 7 Jul 2020 13:19:02 +0200 -Subject: [PATCH] set allowed disk labels for s390x as standard ones (msdos + - gpt) plus dasd - -This will solve issues when a SCSI or NVMe disk with GPT partition table -is used with a s390x machine (rhbz#1827066, rhbz#1854110). ---- - blivet/formats/disklabel.py | 2 +- - tests/formats_test/disklabel_test.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py -index 3dcac12b..53e2c010 100644 ---- a/blivet/formats/disklabel.py -+++ b/blivet/formats/disklabel.py -@@ -230,7 +230,7 @@ def get_platform_label_types(cls): - elif arch.is_efi() and not arch.is_aarch64(): - label_types = ["gpt", "msdos"] - elif arch.is_s390(): -- label_types = ["msdos", "dasd"] -+ label_types += ["dasd"] - - return label_types - -diff --git a/tests/formats_test/disklabel_test.py b/tests/formats_test/disklabel_test.py -index 94f3775f..3068dc07 100644 ---- a/tests/formats_test/disklabel_test.py -+++ b/tests/formats_test/disklabel_test.py -@@ -95,7 +95,7 @@ def test_platform_label_types(self, arch): - arch.is_arm.return_value = False - - arch.is_s390.return_value = True -- self.assertEqual(disklabel_class.get_platform_label_types(), ["msdos", "dasd"]) -+ self.assertEqual(disklabel_class.get_platform_label_types(), ["msdos", "gpt", "dasd"]) - arch.is_s390.return_value = False - - def test_label_type_size_check(self): diff --git a/0002-Do-not-try-to-normalize-size-for-zero-size-device-factories.patch b/0002-Do-not-try-to-normalize-size-for-zero-size-device-factories.patch deleted file mode 100644 index 08b5ab2..0000000 --- a/0002-Do-not-try-to-normalize-size-for-zero-size-device-factories.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8b76e2d72cca787747a2c639edbdfa0af28f9878 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Fri, 23 Aug 2019 09:47:32 +0200 -Subject: [PATCH] Do not try to normalize size for zero size device factories - -Factories with zero size are special cases for adjusting container -size after removing a device for it. We don't want to change size -of the factory in this case. -The recent change of filesystem minimal size to 2 MiB resulted -in changing of size of these factories from 0 to 2 MiB which -caused the "adjusting factory" to create a new LV after removing -one from the container. - -Resolves: rhbz#1743753 ---- - blivet/devicefactory.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py -index e910c5bd..0eb548c7 100644 ---- a/blivet/devicefactory.py -+++ b/blivet/devicefactory.py -@@ -462,6 +462,10 @@ def _get_free_disk_space(self): - def _normalize_size(self): - if self.size is None: - self._handle_no_size() -+ elif self.size == Size(0): -+ # zero size means we're adjusting the container after removing -+ # a device from it so we don't want to change the size here -+ return - - size = self.size - fmt = get_format(self.fstype)