From 958d38db7726ee438362f57493a121d63372dab8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 01:42:47 -0500 Subject: [PATCH] import python-blivet-3.4.0-16.el9 --- ...nfo-in-LVMPhysicalVolume-from-the-ca.patch | 29 + SOURCES/0018-PO-update.patch | 2669 ----------------- ...n-changing-disklabel-on-disks-with-a.patch | 41 + ...ice-should-not-obsolete-ActionRemove.patch | 65 + ..._name-after-adding-removing-a-PV-fro.patch | 63 + ...support-for-creating-LVM-cache-pools.patch | 588 ++++ ...t-current_size-in-LVMVolumeGroupDevi.patch | 29 + ...disks-in-test_get_related_disks-as-n.patch | 36 + ...upport-for-NPIV-enabled-zFCP-devices.patch | 789 +++++ .../0026-Add-a-very-simple-NVMe-module.patch | 129 + .../0027-DDF-RAID-support-using-mdadm.patch | 107 + SPECS/python-blivet.spec | 47 +- 12 files changed, 1918 insertions(+), 2674 deletions(-) create mode 100644 SOURCES/0018-Fix-getting-PV-info-in-LVMPhysicalVolume-from-the-ca.patch delete mode 100644 SOURCES/0018-PO-update.patch create mode 100644 SOURCES/0019-Do-not-crash-when-changing-disklabel-on-disks-with-a.patch create mode 100644 SOURCES/0020-ActionDestroyDevice-should-not-obsolete-ActionRemove.patch create mode 100644 SOURCES/0021-Correctly-set-vg_name-after-adding-removing-a-PV-fro.patch create mode 100644 SOURCES/0022-Add-support-for-creating-LVM-cache-pools.patch create mode 100644 SOURCES/0023-Use-LVM-PV-format-current_size-in-LVMVolumeGroupDevi.patch create mode 100644 SOURCES/0024-tests-Mark-fake-disks-in-test_get_related_disks-as-n.patch create mode 100644 SOURCES/0025-Add-support-for-NPIV-enabled-zFCP-devices.patch create mode 100644 SOURCES/0026-Add-a-very-simple-NVMe-module.patch create mode 100644 SOURCES/0027-DDF-RAID-support-using-mdadm.patch diff --git a/SOURCES/0018-Fix-getting-PV-info-in-LVMPhysicalVolume-from-the-ca.patch b/SOURCES/0018-Fix-getting-PV-info-in-LVMPhysicalVolume-from-the-ca.patch new file mode 100644 index 0000000..42daec5 --- /dev/null +++ b/SOURCES/0018-Fix-getting-PV-info-in-LVMPhysicalVolume-from-the-ca.patch @@ -0,0 +1,29 @@ +From dc6350f87a1dacdebdbb9cf0be43699bb5f7eadd Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Mon, 16 Aug 2021 09:50:34 +0200 +Subject: [PATCH] Fix getting PV info in LVMPhysicalVolume from the cache + +"self.device" is string for formats so accessing "self.device.path" +results in an AttributeError. + +Resolves: rhbz#2079221 +--- + blivet/formats/lvmpv.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/formats/lvmpv.py b/blivet/formats/lvmpv.py +index 3fef667e..483b53a4 100644 +--- a/blivet/formats/lvmpv.py ++++ b/blivet/formats/lvmpv.py +@@ -197,7 +197,7 @@ class LVMPhysicalVolume(DeviceFormat): + if self.exists: + # we don't have any actual value, but the PV exists and is + # active, we should try to determine it +- pv_info = pvs_info.cache.get(self.device.path) ++ pv_info = pvs_info.cache.get(self.device) + if pv_info is None: + log.error("Failed to get free space information for the PV '%s'", self.device) + self._free = Size(0) +-- +2.34.3 + diff --git a/SOURCES/0018-PO-update.patch b/SOURCES/0018-PO-update.patch deleted file mode 100644 index 287b590..0000000 --- a/SOURCES/0018-PO-update.patch +++ /dev/null @@ -1,2669 +0,0 @@ -Submodule po 9d208906...2fea96d4: -diff --git a/po/blivet.pot b/po/blivet.pot -index 7c7e376..15a08f7 100644 ---- a/po/blivet.pot -+++ b/po/blivet.pot -@@ -8,7 +8,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-01-29 14:04+0100\n" -+"POT-Creation-Date: 2021-06-08 10:33+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -18,120 +18,112 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - --#: ../blivet/errors.py:210 --msgid "" --"This is usually caused by cloning the device image resulting in duplication " --"of the UUID value which should be unique. In that case you can either " --"disconnect one of the devices or reformat it." -+#: ../blivet/deviceaction.py:196 -+#, python-format -+msgid "Executing %(action)s" - msgstr "" - --#: ../blivet/errors.py:217 --msgid "" --"For some reason we were unable to locate a disklabel on a disk that the " --"kernel is reporting partitions on. It is unclear what the exact problem is. " --"Please file a bug at http://bugzilla.redhat.com" -+#: ../blivet/deviceaction.py:324 -+msgid "create device" - msgstr "" - --#: ../blivet/errors.py:224 --msgid "" --"Either restore the disklabel to a completely working state or remove it " --"completely.\n" --"Hint: parted can restore it or wipefs can remove it." -+#: ../blivet/deviceaction.py:383 -+msgid "destroy device" - msgstr "" - --#: ../blivet/errors.py:230 --msgid "" --"Rename one of the volume groups so the names are distinct.\n" --"Hint 1: vgrename accepts UUID in place of the old name.\n" --"Hint 2: You can get the VG UUIDs by running 'pvs -o +vg_uuid'." -+#: ../blivet/deviceaction.py:494 -+msgid "resize device" - msgstr "" - --#: ../blivet/fcoe.py:121 --msgid "FCoE not available" -+#: ../blivet/deviceaction.py:583 -+msgid "create format" - msgstr "" - --#: ../blivet/zfcp.py:62 --msgid "You have not specified a device number or the number is invalid" -+#: ../blivet/deviceaction.py:623 -+#, python-format -+msgid "Creating %(type)s on %(device)s" - msgstr "" - --#: ../blivet/zfcp.py:64 --msgid "You have not specified a worldwide port name or the name is invalid." -+#: ../blivet/deviceaction.py:650 -+#, python-format -+msgid "Not enough entropy to create LUKS format. %d bits are needed." - msgstr "" - --#: ../blivet/zfcp.py:66 --msgid "You have not specified a FCP LUN or the number is invalid." -+#: ../blivet/deviceaction.py:680 -+#, python-format -+msgid "Created %(type)s on %(device)s" - msgstr "" - --#: ../blivet/zfcp.py:91 --#, python-format --msgid "zFCP device %s not found, not even in device ignore list." -+#: ../blivet/deviceaction.py:729 -+msgid "destroy format" - msgstr "" - --#: ../blivet/zfcp.py:101 --#, python-format --msgid "Could not set zFCP device %(devnum)s online (%(e)s)." -+#: ../blivet/deviceaction.py:842 -+msgid "resize format" - msgstr "" - --#: ../blivet/zfcp.py:112 -+#: ../blivet/deviceaction.py:881 - #, python-format --msgid "Could not add WWPN %(wwpn)s to zFCP device %(devnum)s (%(e)s)." -+msgid "Resizing filesystem on %(device)s" - msgstr "" - --#. newer zfcp sysfs interface with auto port scan --#: ../blivet/zfcp.py:119 -+#: ../blivet/deviceaction.py:888 - #, python-format --msgid "WWPN %(wwpn)s not found at zFCP device %(devnum)s." -+msgid "Resized filesystem on %(device)s" - msgstr "" - --#: ../blivet/zfcp.py:134 --#, python-format --msgid "" --"Could not add LUN %(fcplun)s to WWPN %(wwpn)s on zFCP device %(devnum)s " --"(%(e)s)." -+#: ../blivet/deviceaction.py:935 -+msgid "add container member" - msgstr "" - --#: ../blivet/zfcp.py:140 --#, python-format --msgid "" --"LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s already configured." -+#: ../blivet/deviceaction.py:1000 -+msgid "remove container member" - msgstr "" - --#: ../blivet/zfcp.py:152 --#, python-format -+#: ../blivet/deviceaction.py:1070 -+msgid "configure format" -+msgstr "" -+ -+#: ../blivet/deviceaction.py:1126 -+msgid "configure device" -+msgstr "" -+ -+#: ../blivet/errors.py:214 - msgid "" --"Could not read failed attribute of LUN %(fcplun)s at WWPN %(wwpn)s on zFCP " --"device %(devnum)s (%(e)s)." -+"This is usually caused by cloning the device image resulting in duplication " -+"of the UUID value which should be unique. In that case you can either " -+"disconnect one of the devices or reformat it." - msgstr "" - --#: ../blivet/zfcp.py:161 --#, python-format -+#: ../blivet/errors.py:221 - msgid "" --"Failed LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s removed " --"again." -+"For some reason we were unable to locate a disklabel on a disk that the " -+"kernel is reporting partitions on. It is unclear what the exact problem is. " -+"Please file a bug at http://bugzilla.redhat.com" - msgstr "" - --#: ../blivet/zfcp.py:218 --#, python-format -+#: ../blivet/errors.py:228 - msgid "" --"Could not correctly delete SCSI device of zFCP %(devnum)s %(wwpn)s " --"%(fcplun)s (%(e)s)." -+"Either restore the disklabel to a completely working state or remove it " -+"completely.\n" -+"Hint: parted can restore it or wipefs can remove it." - msgstr "" - --#: ../blivet/zfcp.py:227 --#, python-format -+#: ../blivet/errors.py:234 - msgid "" --"Could not remove LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s " --"(%(e)s)." -+"Rename one of the volume groups so the names are distinct.\n" -+"Hint 1: vgrename accepts UUID in place of the old name.\n" -+"Hint 2: You can get the VG UUIDs by running 'pvs -o +vg_uuid'." - msgstr "" - --#: ../blivet/zfcp.py:245 --#, python-format --msgid "Could not remove WWPN %(wwpn)s on zFCP device %(devnum)s (%(e)s)." -+#: ../blivet/errors.py:242 -+msgid "" -+"All parent devices must be selected when choosing exclusive or ignored disks " -+"for a multipath or firmware RAID device." - msgstr "" - --#: ../blivet/zfcp.py:271 --#, python-format --msgid "Could not set zFCP device %(devnum)s offline (%(e)s)." -+#: ../blivet/fcoe.py:121 -+msgid "FCoE not available" - msgstr "" - - #: ../blivet/iscsi.py:217 -@@ -142,155 +134,182 @@ msgstr "" - msgid "Must provide an iSCSI initiator name" - msgstr "" - --#: ../blivet/iscsi.py:410 -+#: ../blivet/iscsi.py:413 - msgid "iSCSI not available" - msgstr "" - --#: ../blivet/iscsi.py:412 -+#: ../blivet/iscsi.py:415 - msgid "No initiator name set" - msgstr "" - --#: ../blivet/iscsi.py:530 -+#: ../blivet/iscsi.py:533 - msgid "No iSCSI nodes discovered" - msgstr "" - --#: ../blivet/iscsi.py:550 -+#: ../blivet/iscsi.py:553 - msgid "No new iSCSI nodes discovered" - msgstr "" - --#: ../blivet/iscsi.py:553 -+#: ../blivet/iscsi.py:556 - msgid "Could not log in to any of the discovered nodes" - msgstr "" - --#: ../blivet/partitioning.py:454 -+#: ../blivet/partitioning.py:455 - msgid "unable to allocate aligned partition" - msgstr "" - --#: ../blivet/partitioning.py:462 -+#: ../blivet/partitioning.py:463 - msgid "requested size exceeds maximum allowed" - msgstr "" - --#: ../blivet/partitioning.py:580 -+#: ../blivet/partitioning.py:475 -+#, python-format -+msgid "failed to add partition to disk: %s" -+msgstr "" -+ -+#: ../blivet/partitioning.py:586 - #, python-format - msgid "disk %s inaccessible" - msgstr "" - --#: ../blivet/partitioning.py:641 -+#: ../blivet/partitioning.py:647 - #, python-format - msgid "" - "partition is too small for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" - --#: ../blivet/partitioning.py:646 -+#: ../blivet/partitioning.py:652 - #, python-format - msgid "" - "partition is too large for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" - --#: ../blivet/partitioning.py:962 -+#: ../blivet/partitioning.py:968 - msgid "Unable to allocate requested partition scheme." - msgstr "" - --#: ../blivet/partitioning.py:997 -+#: ../blivet/partitioning.py:1003 - msgid "not enough free space after creating extended partition" - msgstr "" - --#: ../blivet/partitioning.py:1004 -+#: ../blivet/partitioning.py:1010 - msgid "failed to allocate aligned partition" - msgstr "" - --#: ../blivet/partitioning.py:1205 -+#: ../blivet/partitioning.py:1211 - msgid "cannot reclaim more than request has grown" - msgstr "" - --#: ../blivet/partitioning.py:1419 -+#: ../blivet/partitioning.py:1425 - msgid "DiskChunk requests must be of type PartitionRequest" - msgstr "" - --#: ../blivet/partitioning.py:1432 -+#: ../blivet/partitioning.py:1438 - msgid "partitions allocated outside disklabel limits" - msgstr "" - --#: ../blivet/partitioning.py:1517 -+#: ../blivet/partitioning.py:1523 - msgid "VGChunk requests must be of type LVRequest" - msgstr "" - - #. by now we have allocated the PVs so if there isn't enough - #. space in the VG we have a real problem --#: ../blivet/partitioning.py:2025 -+#: ../blivet/partitioning.py:2031 - msgid "not enough space for LVM requests" - msgstr "" - --#: ../blivet/deviceaction.py:194 --#, python-format --msgid "Executing %(action)s" -+#: ../blivet/zfcp.py:62 -+msgid "You have not specified a device number or the number is invalid" - msgstr "" - --#: ../blivet/deviceaction.py:322 --msgid "create device" -+#: ../blivet/zfcp.py:64 -+msgid "You have not specified a worldwide port name or the name is invalid." - msgstr "" - --#: ../blivet/deviceaction.py:381 --msgid "destroy device" -+#: ../blivet/zfcp.py:66 -+msgid "You have not specified a FCP LUN or the number is invalid." - msgstr "" - --#: ../blivet/deviceaction.py:484 --msgid "resize device" -+#: ../blivet/zfcp.py:91 -+#, python-format -+msgid "zFCP device %s not found, not even in device ignore list." - msgstr "" - --#: ../blivet/deviceaction.py:573 --msgid "create format" -+#: ../blivet/zfcp.py:101 -+#, python-format -+msgid "Could not set zFCP device %(devnum)s online (%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:613 -+#: ../blivet/zfcp.py:112 - #, python-format --msgid "Creating %(type)s on %(device)s" -+msgid "Could not add WWPN %(wwpn)s to zFCP device %(devnum)s (%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:640 -+#. newer zfcp sysfs interface with auto port scan -+#: ../blivet/zfcp.py:119 - #, python-format --msgid "Not enough entropy to create LUKS format. %d bits are needed." -+msgid "WWPN %(wwpn)s not found at zFCP device %(devnum)s." - msgstr "" - --#: ../blivet/deviceaction.py:670 -+#: ../blivet/zfcp.py:134 - #, python-format --msgid "Created %(type)s on %(device)s" -+msgid "" -+"Could not add LUN %(fcplun)s to WWPN %(wwpn)s on zFCP device %(devnum)s " -+"(%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:717 --msgid "destroy format" -+#: ../blivet/zfcp.py:140 -+#, python-format -+msgid "" -+"LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s already configured." - msgstr "" - --#: ../blivet/deviceaction.py:830 --msgid "resize format" -+#: ../blivet/zfcp.py:152 -+#, python-format -+msgid "" -+"Could not read failed attribute of LUN %(fcplun)s at WWPN %(wwpn)s on zFCP " -+"device %(devnum)s (%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:869 -+#: ../blivet/zfcp.py:161 - #, python-format --msgid "Resizing filesystem on %(device)s" -+msgid "" -+"Failed LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s removed " -+"again." - msgstr "" - --#: ../blivet/deviceaction.py:876 -+#: ../blivet/zfcp.py:218 - #, python-format --msgid "Resized filesystem on %(device)s" -+msgid "" -+"Could not correctly delete SCSI device of zFCP %(devnum)s %(wwpn)s " -+"%(fcplun)s (%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:923 --msgid "add container member" -+#: ../blivet/zfcp.py:227 -+#, python-format -+msgid "" -+"Could not remove LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s " -+"(%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:988 --msgid "remove container member" -+#: ../blivet/zfcp.py:245 -+#, python-format -+msgid "Could not remove WWPN %(wwpn)s on zFCP device %(devnum)s (%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:1058 --msgid "configure format" -+#: ../blivet/zfcp.py:271 -+#, python-format -+msgid "Could not set zFCP device %(devnum)s offline (%(e)s)." - msgstr "" - --#: ../blivet/deviceaction.py:1114 --msgid "configure device" -+#: ../blivet/devicelibs/lvm.py:59 -+msgid "Generic" -+msgstr "" -+ -+#: ../blivet/devicelibs/lvm.py:60 -+msgid "Performance" - msgstr "" - - #: ../blivet/devices/raid.py:58 -@@ -315,54 +334,54 @@ msgstr "" - msgid "Cannot remove a member from existing %s array" - msgstr "" - --#: ../blivet/formats/fs.py:932 --msgid "EFI System Partition" -+#: ../blivet/formats/biosboot.py:35 -+msgid "BIOS Boot" - msgstr "" - --#: ../blivet/formats/fs.py:1137 --msgid "Apple Bootstrap" -+#: ../blivet/formats/disklabel.py:50 -+msgid "partition table" - msgstr "" - --#: ../blivet/formats/fs.py:1173 --msgid "Linux HFS+ ESP" -+#. Translators: Name for an unsupported disklabel; e.g. "Unsupported partition table" -+#: ../blivet/formats/disklabel.py:326 -+#, python-format -+msgid "Unsupported %(name)s" - msgstr "" - --#: ../blivet/formats/prepboot.py:37 --msgid "PPC PReP Boot" -+#: ../blivet/formats/dmraid.py:37 -+msgid "dm-raid member device" - msgstr "" - --#: ../blivet/formats/luks.py:58 --msgid "LUKS" -+#: ../blivet/formats/fs.py:947 -+msgid "EFI System Partition" - msgstr "" - --#: ../blivet/formats/luks.py:59 --msgid "Encrypted" -+#: ../blivet/formats/fs.py:1155 -+msgid "Apple Bootstrap" - msgstr "" - --#: ../blivet/formats/luks.py:388 --msgid "DM Integrity" -+#: ../blivet/formats/fs.py:1191 -+msgid "Linux HFS+ ESP" - msgstr "" - - #: ../blivet/formats/__init__.py:148 - msgid "Unknown" - msgstr "" - --#: ../blivet/formats/biosboot.py:35 --msgid "BIOS Boot" -+#: ../blivet/formats/luks.py:60 -+msgid "LUKS" - msgstr "" - --#: ../blivet/formats/dmraid.py:37 --msgid "dm-raid member device" -+#: ../blivet/formats/luks.py:61 -+msgid "Encrypted" - msgstr "" - --#: ../blivet/formats/disklabel.py:50 --msgid "partition table" -+#: ../blivet/formats/luks.py:402 -+msgid "DM Integrity" - msgstr "" - --#. Translators: Name for an unsupported disklabel; e.g. "Unsupported partition table" --#: ../blivet/formats/disklabel.py:320 --#, python-format --msgid "Unsupported %(name)s" -+#: ../blivet/formats/lvmpv.py:49 -+msgid "physical volume (LVM)" - msgstr "" - - #: ../blivet/formats/mdraid.py:43 -@@ -373,14 +392,6 @@ msgstr "" - msgid "multipath member device" - msgstr "" - --#: ../blivet/formats/lvmpv.py:49 --msgid "physical volume (LVM)" --msgstr "" -- --#: ../blivet/devicelibs/lvm.py:59 --msgid "Generic" --msgstr "" -- --#: ../blivet/devicelibs/lvm.py:60 --msgid "Performance" -+#: ../blivet/formats/prepboot.py:37 -+msgid "PPC PReP Boot" - msgstr "" -diff --git a/po/bn_IN.po b/po/bn_IN.po -index 9e684dd..e91e275 100644 ---- a/po/bn_IN.po -+++ b/po/bn_IN.po -@@ -13,7 +13,6 @@ - # runab , 2004-2010 - # runa , 2012 - # Saibal Ray, 2014 --# Akarshan Biswas , 2020. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" -@@ -22,7 +21,7 @@ msgstr "" - "PO-Revision-Date: 2020-06-25 14:40+0000\n" - "Last-Translator: Akarshan Biswas \n" - "Language-Team: Bengali (India) \n" -+"blivet/blivet-rhel8/bn_IN/>\n" - "Language: bn_IN\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff --git a/po/cs.po b/po/cs.po -index 2a5735b..1ddfdf4 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -20,16 +20,16 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2019-02-25 09:38+0000\n" --"Last-Translator: Zdenek \n" --"Language-Team: Czech (http://www.transifex.com/projects/p/blivet/language/" --"cs/)\n" -+"PO-Revision-Date: 2021-12-03 22:16+0000\n" -+"Last-Translator: Pavel Borecki \n" -+"Language-Team: Czech \n" - "Language: cs\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" --"X-Generator: Zanata 4.6.2\n" -+"X-Generator: Weblate 4.9.1\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -37,6 +37,10 @@ msgid "" - "of the UUID value which should be unique. In that case you can either " - "disconnect one of the devices or reformat it." - msgstr "" -+"Toto je obvykle způsobeno klonování obrazu zařízení, což má za následek " -+"vícero výskytů hodnoty nikde se neopakující identifikátoru (UUID), který by " -+"měl být unikátní. V takovém případě můžete jedno ze zařízení odpojit, nebo " -+"na něm vytvořit souborový systém odznovu." - - #: ../blivet/errors.py:217 - msgid "" -@@ -355,7 +359,7 @@ msgstr[2] "" - msgid "" - "RAID level %(raid_level)s is an invalid value. Must be one of (%(levels)s)." - msgstr "" --"%(raid_level)s není povolená hodnota pro typ RAIDu. Povolené typy: " -+"%(raid_level)s není povolená hodnota pro typ RAIDu. Povolené typy: " - "(%(levels)s)." - - #: ../blivet/devices/raid.py:104 -diff --git a/po/es.po b/po/es.po -index 04bc743..ac3db6e 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -26,22 +26,21 @@ - # Abdel G. Martínez L. , 2015. #zanata - # Máximo Castañeda Riloba , 2016. #zanata - # Máximo Castañeda Riloba , 2018. #zanata --# Adolfo Jayme Barrientos , 2020. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-08-16 12:29+0000\n" --"Last-Translator: Adolfo Jayme Barrientos \n" -+"PO-Revision-Date: 2021-12-11 12:16+0000\n" -+"Last-Translator: Emilio Herrera \n" - "Language-Team: Spanish \n" -+"blivet-rhel9/es/>\n" - "Language: es\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" --"X-Generator: Weblate 4.1.1\n" -+"X-Generator: Weblate 4.9.1\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -59,9 +58,9 @@ msgid "" - "kernel is reporting partitions on. It is unclear what the exact problem is. " - "Please file a bug at http://bugzilla.redhat.com" - msgstr "" --"No se puede localizar la etiqueta en el disco en el que el núcleo informa de " --"las particiones. La causa del problema no es obvia. Informe del problema en " --"https://bugzilla.redhat.com" -+"Por alguna razón no somos capaces de localizar la etiqueta en el disco en el " -+"que el núcleo informa de las particiones. No está claro cuál es el problema " -+"exacto. Informe del problema en https://bugzilla.redhat.com" - - #: ../blivet/errors.py:224 - msgid "" -@@ -99,33 +98,31 @@ msgstr "No ha especificado un nombre de puerto global o el nombre no es válido. - - #: ../blivet/zfcp.py:66 - msgid "You have not specified a FCP LUN or the number is invalid." --msgstr "No ha especificado un FCP LUN o el número no es válido." -+msgstr "No ha especificado un FCP LUN o el número es inválido." - - #: ../blivet/zfcp.py:91 - #, python-format - msgid "zFCP device %s not found, not even in device ignore list." - msgstr "" --"No se encontró el dispositivo zFCP %s, ni siquiera en la lista de " --"dispositivos que ignorar." -+"El dispositivo zFCP %s no fue encontrado, ni siquiera en la lista de " -+"dispositivos a ignorar." - - #: ../blivet/zfcp.py:101 - #, python-format - msgid "Could not set zFCP device %(devnum)s online (%(e)s)." --msgstr "" --"No se pudo configurar el dispositivo zFCP %(devnum)s en modo en línea " --"(%(e)s)." -+msgstr "No se pudo establecer al dispositivo zFCP %(devnum)s en línea (%(e)s)." - - #: ../blivet/zfcp.py:112 - #, python-format - msgid "Could not add WWPN %(wwpn)s to zFCP device %(devnum)s (%(e)s)." - msgstr "" --"No se pudo añadir el WWPN %(wwpn)s al dispositivo zFCP %(devnum)s (%(e)s)." -+"No se pudo agregar el WWPN %(wwpn)s al dispositivo zFCP %(devnum)s (%(e)s)." - - #. newer zfcp sysfs interface with auto port scan - #: ../blivet/zfcp.py:119 - #, python-format - msgid "WWPN %(wwpn)s not found at zFCP device %(devnum)s." --msgstr "No se encontró el WWPN %(wwpn)s en el dispositivo zFCP %(devnum)s." -+msgstr "El WWPN %(wwpn)s no fue encontrado en el dispositivo zFCP %(devnum)s." - - #: ../blivet/zfcp.py:134 - #, python-format -@@ -133,7 +130,7 @@ msgid "" - "Could not add LUN %(fcplun)s to WWPN %(wwpn)s on zFCP device %(devnum)s " - "(%(e)s)." - msgstr "" --"No se pudo añadir el LUN %(fcplun)s al WWPN %(wwpn)s en el dispositivo zFCP " -+"No se pudo agregar el LUN %(fcplun)s al WWPN %(wwpn)s en el dispositivo zFCP " - "%(devnum)s (%(e)s)." - - #: ../blivet/zfcp.py:140 -@@ -212,7 +209,7 @@ msgstr "No se ha definido un nombre del iniciador" - - #: ../blivet/iscsi.py:530 - msgid "No iSCSI nodes discovered" --msgstr "No se descubrió ningún nodo iSCSI" -+msgstr "No han sido descubiertos nodos iSCSI" - - #: ../blivet/iscsi.py:550 - msgid "No new iSCSI nodes discovered" -@@ -387,15 +384,15 @@ msgstr "No puede eliminar un miembro de un conjunto %s existente" - - #: ../blivet/formats/fs.py:932 - msgid "EFI System Partition" --msgstr "Partición de sistema EFI" -+msgstr "Partición de Sistema EFI" - - #: ../blivet/formats/fs.py:1137 - msgid "Apple Bootstrap" --msgstr "Bootstrap de Apple" -+msgstr "Apple Bootstrap" - - #: ../blivet/formats/fs.py:1173 - msgid "Linux HFS+ ESP" --msgstr "ESP HFS+ de Linux" -+msgstr "Linux HFS+ ESP" - - #: ../blivet/formats/prepboot.py:37 - msgid "PPC PReP Boot" -diff --git a/po/fa.po b/po/fa.po -index d9ceae0..326a7e5 100644 ---- a/po/fa.po -+++ b/po/fa.po -@@ -15,22 +15,21 @@ - # Morteza Adi , 2012 - # Noori , 2011 - # Roozbeh Pournader , 2005-2006 --# Amirerfan Rafati , 2021. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2021-04-26 05:02+0000\n" --"Last-Translator: Amirerfan Rafati \n" --"Language-Team: Persian \n" -+"PO-Revision-Date: 2015-01-05 05:26+0000\n" -+"Last-Translator: Copied by Zanata \n" -+"Language-Team: Persian (http://www.transifex.com/projects/p/blivet/language/" -+"fa/)\n" - "Language: fa\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.6\n" -+"X-Generator: Zanata 4.6.2\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -38,9 +37,6 @@ msgid "" - "of the UUID value which should be unique. In that case you can either " - "disconnect one of the devices or reformat it." - msgstr "" --"این اتفاق معمولا در اثر کلون کردن ایمیج یک دستگاه رخ می‌دهد و سبب می‌شود " --"UUID‌ها که باید یکتا باشند، تکراری شوند. در این صورت شما می‌توانید یکی از " --"دستگاه‌های را جدا کنید یا آن را فرمت کنید." - - #: ../blivet/errors.py:217 - msgid "" -@@ -65,11 +61,11 @@ msgstr "" - - #: ../blivet/fcoe.py:121 - msgid "FCoE not available" --msgstr "FCoE موجود نیست" -+msgstr "FCoE موجود نیست" - - #: ../blivet/zfcp.py:62 - msgid "You have not specified a device number or the number is invalid" --msgstr "شمارهٔ دستگاهی مشخص نکرده‌اید یا شماره معتبر نیست" -+msgstr "شمارهٔ دستگاهی مشخص نکرده‌اید یا شماره معتبر نیست." - - #: ../blivet/zfcp.py:64 - msgid "You have not specified a worldwide port name or the name is invalid." -@@ -82,7 +78,7 @@ msgstr "شمارهٔ قطعهٔ منطقی FCP را مشخص نکرده‌اید - #: ../blivet/zfcp.py:91 - #, python-format - msgid "zFCP device %s not found, not even in device ignore list." --msgstr "وسیله ی zFCP %s یافت نشد، حتی در لیست ابزار نادیده گرفته شده." -+msgstr "وسیله ی zFCP %s یافت نشد، حتی در لیست ابزار نادیده گرفته شده" - - #: ../blivet/zfcp.py:101 - #, python-format -@@ -92,7 +88,8 @@ msgstr "نمی توان وسیله ی zFCP %(devnum)s online (%(e)s) تنظیم - #: ../blivet/zfcp.py:112 - #, python-format - msgid "Could not add WWPN %(wwpn)s to zFCP device %(devnum)s (%(e)s)." --msgstr "نمی تواند WWPN %(wwpn)s به وسیله ی zFCP %(devnum)s (%(e)s) اضافه کند." -+msgstr "" -+"نمی تواند WWPN %(wwpn)s به وسیله ی zFCP %(devnum)s (%(e)s) اضافه کند." - - #. newer zfcp sysfs interface with auto port scan - #: ../blivet/zfcp.py:119 -@@ -106,15 +103,15 @@ msgid "" - "Could not add LUN %(fcplun)s to WWPN %(wwpn)s on zFCP device %(devnum)s " - "(%(e)s)." - msgstr "" --"نمی تواند LUN %(fcplun)s به WWPN %(wwpn)s در وسیله ی zFCP اضافه کند %(devnum)" --"s (%(e)s)." -+"نمی تواند LUN %(fcplun)s به WWPN %(wwpn)s در وسیله ی zFCP اضافه کند " -+"%(devnum)s (%(e)s)." - - #: ../blivet/zfcp.py:140 - #, python-format - msgid "" - "LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s already configured." - msgstr "" --"LUN %(fcplun)s در WWPN %(wwpn)s بر روی وسیله ی zFCP %(devnum)s از قبل پیکره " -+"LUN %(fcplun)s در WWPN %(wwpn)s بر روی وسیله ی zFCP %(devnum)s از قبل پیکره " - "بندی شده است." - - #: ../blivet/zfcp.py:152 -@@ -156,7 +153,7 @@ msgstr "" - #: ../blivet/zfcp.py:245 - #, python-format - msgid "Could not remove WWPN %(wwpn)s on zFCP device %(devnum)s (%(e)s)." --msgstr "نمی توان WWPN %(wwpn)s را از وسیله zFCP %(devnum)s (%(e)s) برداشت." -+msgstr "نمی توان WWPN %(wwpn)s را از وسیله zFCP %(devnum)s (%(e)s) برداشت" - - #: ../blivet/zfcp.py:271 - #, python-format -@@ -169,7 +166,7 @@ msgstr "قادر به تغییر نام آغازگر iSCSI تنظیم نیست" - - #: ../blivet/iscsi.py:219 - msgid "Must provide an iSCSI initiator name" --msgstr "باید نام یک آغازگر iSCSI را وارد کنید" -+msgstr "باید نام یک آغازگر iSCSI را وارد کنید." - - #: ../blivet/iscsi.py:410 - msgid "iSCSI not available" -@@ -181,7 +178,7 @@ msgstr "هیچ نام آغازگری تنطیم نشد" - - #: ../blivet/iscsi.py:530 - msgid "No iSCSI nodes discovered" --msgstr "هیچ گره iSCSI یافت نشد" -+msgstr "" - - #: ../blivet/iscsi.py:550 - msgid "No new iSCSI nodes discovered" -@@ -189,7 +186,7 @@ msgstr "هیچ گره iSCSI جدیدی یافت نشد" - - #: ../blivet/iscsi.py:553 - msgid "Could not log in to any of the discovered nodes" --msgstr "قادر به لاگین کردن به هیچ یک از گره‌های یافت شده نیستیم" -+msgstr "" - - #: ../blivet/partitioning.py:454 - msgid "unable to allocate aligned partition" -@@ -197,12 +194,12 @@ msgstr "" - - #: ../blivet/partitioning.py:462 - msgid "requested size exceeds maximum allowed" --msgstr "اندازه درخواستی از اندازه بیشینه مجاز بیشتر است" -+msgstr "" - - #: ../blivet/partitioning.py:580 - #, python-format - msgid "disk %s inaccessible" --msgstr "دیسک %s در دسترس نیست" -+msgstr "" - - #: ../blivet/partitioning.py:641 - #, python-format -@@ -210,8 +207,6 @@ msgid "" - "partition is too small for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" --"بخش برای فرمت %(format)s بسیار کوچک است (اندازه مجاز از %(min_size)s تا " --"%(max_size)s است)" - - #: ../blivet/partitioning.py:646 - #, python-format -@@ -219,8 +214,6 @@ msgid "" - "partition is too large for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" --"بخش برای فرمت %(format)s بسیار بزرگ است (اندازه مجاز از %(min_size)s تا " --"%(max_size)s است)" - - #: ../blivet/partitioning.py:962 - msgid "Unable to allocate requested partition scheme." -@@ -254,16 +247,16 @@ msgstr "" - #. space in the VG we have a real problem - #: ../blivet/partitioning.py:2025 - msgid "not enough space for LVM requests" --msgstr "فضای کافی برای درخواست‌های LVM وجود ندارد" -+msgstr "" - - #: ../blivet/deviceaction.py:194 - #, python-format - msgid "Executing %(action)s" --msgstr "در حال اجرای %(action)s" -+msgstr "" - - #: ../blivet/deviceaction.py:322 - msgid "create device" --msgstr "ساخت دستگاه" -+msgstr "" - - #: ../blivet/deviceaction.py:381 - msgid "destroy device" -@@ -271,11 +264,11 @@ msgstr "" - - #: ../blivet/deviceaction.py:484 - msgid "resize device" --msgstr "تغییر اندازه دستگاه" -+msgstr "" - - #: ../blivet/deviceaction.py:573 - msgid "create format" --msgstr "ساخت فرمت" -+msgstr "" - - #: ../blivet/deviceaction.py:613 - #, python-format -@@ -290,25 +283,25 @@ msgstr "" - #: ../blivet/deviceaction.py:670 - #, python-format - msgid "Created %(type)s on %(device)s" --msgstr "%(type)s روی %(device)s ساخته شد" -+msgstr "" - - #: ../blivet/deviceaction.py:717 - msgid "destroy format" --msgstr "حذف فرمت" -+msgstr "" - - #: ../blivet/deviceaction.py:830 - msgid "resize format" --msgstr "تغییر اندازه فرمت" -+msgstr "" - - #: ../blivet/deviceaction.py:869 - #, python-format - msgid "Resizing filesystem on %(device)s" --msgstr "در حال تغییر اندازه فایل سیستم بر %(device)s" -+msgstr "" - - #: ../blivet/deviceaction.py:876 - #, python-format - msgid "Resized filesystem on %(device)s" --msgstr "اندازه فایل سیستم روی %(device)s تغییر کرد" -+msgstr "" - - #: ../blivet/deviceaction.py:923 - msgid "add container member" -@@ -320,11 +313,11 @@ msgstr "" - - #: ../blivet/deviceaction.py:1058 - msgid "configure format" --msgstr "تنظیم فرمت" -+msgstr "" - - #: ../blivet/deviceaction.py:1114 - msgid "configure device" --msgstr "تنظیم دستگاه" -+msgstr "" - - #: ../blivet/devices/raid.py:58 - #, python-format -@@ -335,13 +328,12 @@ msgid_plural "" - "RAID level %(raid_level)s requires that device have at least %(min_members)d " - "members." - msgstr[0] "" --"RAID سطح %(raid_level)s نیاز به دستگاهی با حداقل %(min_members)d عضو دارد." - - #: ../blivet/devices/raid.py:79 - #, python-format - msgid "" - "RAID level %(raid_level)s is an invalid value. Must be one of (%(levels)s)." --msgstr "RAID سطح %(raid_level)s نامعتبر است. باید یکی ازسطوح (%(levels)s) باشد." -+msgstr "" - - #: ../blivet/devices/raid.py:104 - #, python-format -@@ -366,7 +358,7 @@ msgstr "" - - #: ../blivet/formats/luks.py:58 - msgid "LUKS" --msgstr "LUKS" -+msgstr "" - - #: ../blivet/formats/luks.py:59 - msgid "Encrypted" -@@ -378,7 +370,7 @@ msgstr "" - - #: ../blivet/formats/__init__.py:148 - msgid "Unknown" --msgstr "ناشناخته" -+msgstr "" - - #: ../blivet/formats/biosboot.py:35 - msgid "BIOS Boot" -@@ -400,7 +392,7 @@ msgstr "" - - #: ../blivet/formats/mdraid.py:43 - msgid "software RAID" --msgstr "RAID نرم‌افزاری" -+msgstr "" - - #: ../blivet/formats/multipath.py:40 - msgid "multipath member device" -diff --git a/po/fi.po b/po/fi.po -index 6ce6cf7..8b1518a 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -12,23 +12,21 @@ - # Updated by Tomi Kajala , 2000-2001 - # Ville-Pekka Vainio , 2011 - # Ville-Pekka Vainio , 2011-2012 --# Ricky Tigg , 2020. --# Jan Kuparinen , 2021. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2021-04-22 15:02+0000\n" -+"PO-Revision-Date: 2021-05-27 07:02+0000\n" - "Last-Translator: Jan Kuparinen \n" - "Language-Team: Finnish \n" -+"blivet-rhel8/fi/>\n" - "Language: fi\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" --"X-Generator: Weblate 4.6\n" -+"X-Generator: Weblate 4.6.2\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -238,7 +236,7 @@ msgstr "ei ole tarpeeksi vapaata tilaa laajennetun osion luomisen jälkeen" - - #: ../blivet/partitioning.py:1004 - msgid "failed to allocate aligned partition" --msgstr "kohdistetun osion jakaminen epäonnistui" -+msgstr "ei voi kohdistaa kohdistettua osiota" - - #: ../blivet/partitioning.py:1205 - msgid "cannot reclaim more than request has grown" -@@ -309,7 +307,7 @@ msgstr "Muuta alustan koko" - #: ../blivet/deviceaction.py:869 - #, python-format - msgid "Resizing filesystem on %(device)s" --msgstr "Tiedostojärjestelmän koon muuttaminen %(device)s:lla" -+msgstr "Tiedostojärjestelmän kokoa muutetaan %(device)s:lla" - - #: ../blivet/deviceaction.py:876 - #, python-format -diff --git a/po/hr.po b/po/hr.po -index a597f85..e12a494 100644 ---- a/po/hr.po -+++ b/po/hr.po -@@ -10,17 +10,17 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2015-01-05 05:27+0000\n" --"Last-Translator: Copied by Zanata \n" --"Language-Team: Croatian (http://www.transifex.com/projects/p/blivet/language/" --"hr/)\n" -+"PO-Revision-Date: 2021-10-21 13:05+0000\n" -+"Last-Translator: Gogo Gogsi \n" -+"Language-Team: Croatian \n" - "Language: hr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" - "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" --"X-Generator: Zanata 4.6.2\n" -+"X-Generator: Weblate 4.8\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -28,6 +28,9 @@ msgid "" - "of the UUID value which should be unique. In that case you can either " - "disconnect one of the devices or reformat it." - msgstr "" -+"Ovo je uobičajeno prouzrokovano kloniranjem slike uređaja što rezultira " -+"duplikatom UUID vrijednosti koja mora biti jedinstvena. U tome slučaju " -+"možete ili odspojiti jedan od uređaja ili ga ponovno formatirati." - - #: ../blivet/errors.py:217 - msgid "" -@@ -35,6 +38,9 @@ msgid "" - "kernel is reporting partitions on. It is unclear what the exact problem is. " - "Please file a bug at http://bugzilla.redhat.com" - msgstr "" -+"Iz određenog razloga nemoguće je locirati oznaku diska na disku na kojemu je " -+"kernel prijavio particiju. Nejasno je što je točno problem. Prijavite grešku " -+"na http://bugzilla.redhat.com" - - #: ../blivet/errors.py:224 - msgid "" -@@ -42,6 +48,9 @@ msgid "" - "completely.\n" - "Hint: parted can restore it or wipefs can remove it." - msgstr "" -+"Ili obnovite oznaku diska u potpuno radno stanje ili ga u potpunosti " -+"uklonite.\n" -+"Napomena: parted može obnoviti ili ga wipefs može ukloniti." - - #: ../blivet/errors.py:230 - msgid "" -@@ -49,43 +58,46 @@ msgid "" - "Hint 1: vgrename accepts UUID in place of the old name.\n" - "Hint 2: You can get the VG UUIDs by running 'pvs -o +vg_uuid'." - msgstr "" -+"Preimenujte jednu od grupa uređaja tako da se naziv razlikuju.\n" -+"Napomena 1: vgrename prihvaća UUID na mjestu starog naziva.\n" -+"Napomena 2: Možete dobiti UUID-ove GU pokretanjem 'pvs -o +vg_uuid'." - - #: ../blivet/fcoe.py:121 - msgid "FCoE not available" --msgstr "" -+msgstr "FCoE nije dostupan" - - #: ../blivet/zfcp.py:62 - msgid "You have not specified a device number or the number is invalid" --msgstr "Broj uređaja nije određen ili je nepravilan." -+msgstr "Niste naveli broj uređaja ili je broj nevaljan" - - #: ../blivet/zfcp.py:64 - msgid "You have not specified a worldwide port name or the name is invalid." --msgstr "Naziv otvorenog porta nije određen ili je nepravilan." -+msgstr "Niste naveli naziv svjetskog ulaza ili je naziv nevaljan." - - #: ../blivet/zfcp.py:66 - msgid "You have not specified a FCP LUN or the number is invalid." --msgstr "FCP LUN nije određen ili je nepravilan." -+msgstr "Niste naveli FCP LUN ili je broj nevaljan." - - #: ../blivet/zfcp.py:91 - #, python-format - msgid "zFCP device %s not found, not even in device ignore list." --msgstr "" -+msgstr "zFCP uređaj %s nije pronađen, čak ni u popisu zanemarenih diskova." - - #: ../blivet/zfcp.py:101 - #, python-format - msgid "Could not set zFCP device %(devnum)s online (%(e)s)." --msgstr "" -+msgstr "Nemoguće postavljanje zFCP uređaja %(devnum)s je na mreži (%(e)s)." - - #: ../blivet/zfcp.py:112 - #, python-format - msgid "Could not add WWPN %(wwpn)s to zFCP device %(devnum)s (%(e)s)." --msgstr "" -+msgstr "Nemoguće dodavanje WWPN %(wwpn)s na zFCP uređaj %(devnum)s (%(e)s)." - - #. newer zfcp sysfs interface with auto port scan - #: ../blivet/zfcp.py:119 - #, python-format - msgid "WWPN %(wwpn)s not found at zFCP device %(devnum)s." --msgstr "" -+msgstr "WWPN %(wwpn)s nije pronađen na zFCP uređaju %(devnum)s." - - #: ../blivet/zfcp.py:134 - #, python-format -@@ -93,12 +105,15 @@ msgid "" - "Could not add LUN %(fcplun)s to WWPN %(wwpn)s on zFCP device %(devnum)s " - "(%(e)s)." - msgstr "" -+"Nemoguće dodavanje LUN %(fcplun)s u WWPN %(wwpn)s na zFCP uređaju %(devnum)s " -+"(%(e)s)." - - #: ../blivet/zfcp.py:140 - #, python-format - msgid "" - "LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s already configured." - msgstr "" -+"LUN %(fcplun)s u WWPN %(wwpn)s na zFCP uređaju %(devnum)s je već podešen." - - #: ../blivet/zfcp.py:152 - #, python-format -@@ -106,6 +121,8 @@ msgid "" - "Could not read failed attribute of LUN %(fcplun)s at WWPN %(wwpn)s on zFCP " - "device %(devnum)s (%(e)s)." - msgstr "" -+"Neuspjelo čitanje neuspjelih svojstava od LUN %(fcplun)s u WWPN %(wwpn)s na " -+"zFCP uređaju %(devnum)s (%(e)s)." - - #: ../blivet/zfcp.py:161 - #, python-format -@@ -113,6 +130,8 @@ msgid "" - "Failed LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s removed " - "again." - msgstr "" -+"Neuspjeli LUN %(fcplun)s u WWPN %(wwpn)s na zFCP uređaju %(devnum)s ponovno " -+"je uklonjen." - - #: ../blivet/zfcp.py:218 - #, python-format -@@ -120,6 +139,8 @@ msgid "" - "Could not correctly delete SCSI device of zFCP %(devnum)s %(wwpn)s " - "%(fcplun)s (%(e)s)." - msgstr "" -+"Neuspjelo pravilno brisanje SCSI uređaja od zFCP %(devnum)s %(wwpn)s " -+"%(fcplun)s (%(e)s)." - - #: ../blivet/zfcp.py:227 - #, python-format -@@ -127,57 +148,59 @@ msgid "" - "Could not remove LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s " - "(%(e)s)." - msgstr "" -+"Nemoguće uklanjanje LUN %(fcplun)s u WWPN %(wwpn)s na zFCP uređaju %(devnum)" -+"s (%(e)s)." - - #: ../blivet/zfcp.py:245 - #, python-format - msgid "Could not remove WWPN %(wwpn)s on zFCP device %(devnum)s (%(e)s)." --msgstr "" -+msgstr "NEmoguće uklanjanje WWPN %(wwpn)s na zFCP uređaju %(devnum)s (%(e)s)." - - #: ../blivet/zfcp.py:271 - #, python-format - msgid "Could not set zFCP device %(devnum)s offline (%(e)s)." --msgstr "" -+msgstr "Nemoguće postavljanje zFCP uređaja %(devnum)s nije na mreži (%(e)s)." - - #: ../blivet/iscsi.py:217 - msgid "Unable to change iSCSI initiator name once set" --msgstr "" -+msgstr "Nemoguće promjena naziva iSCSI pokretača jednom kada je postavljeno" - - #: ../blivet/iscsi.py:219 - msgid "Must provide an iSCSI initiator name" --msgstr "" -+msgstr "Morate navesti naziv iSCSI pokretača" - - #: ../blivet/iscsi.py:410 - msgid "iSCSI not available" --msgstr "" -+msgstr "iSCSI nije dostupan" - - #: ../blivet/iscsi.py:412 - msgid "No initiator name set" --msgstr "" -+msgstr "Nema postavljenog naziva pokretača" - - #: ../blivet/iscsi.py:530 - msgid "No iSCSI nodes discovered" --msgstr "" -+msgstr "Nema otkrivenih iSCSI čvorova" - - #: ../blivet/iscsi.py:550 - msgid "No new iSCSI nodes discovered" --msgstr "" -+msgstr "Nema otkrivenih novih iSCSI čvorova" - - #: ../blivet/iscsi.py:553 - msgid "Could not log in to any of the discovered nodes" --msgstr "" -+msgstr "Nemoguća prijava na bilo koji od otkrivenih čvorova" - - #: ../blivet/partitioning.py:454 - msgid "unable to allocate aligned partition" --msgstr "" -+msgstr "Nemoguća premještanje poravnane particije" - - #: ../blivet/partitioning.py:462 - msgid "requested size exceeds maximum allowed" --msgstr "" -+msgstr "zahtijevana veličina premašuje najveću dopuštenu" - - #: ../blivet/partitioning.py:580 - #, python-format - msgid "disk %s inaccessible" --msgstr "" -+msgstr "disk %s je nedostupan" - - #: ../blivet/partitioning.py:641 - #, python-format -@@ -185,6 +208,8 @@ msgid "" - "partition is too small for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" -+"particija je premala za %(format)s formatiranje (dopuštena veličina je od " -+"%(min_size)s do %(max_size)s)" - - #: ../blivet/partitioning.py:646 - #, python-format -@@ -192,110 +217,112 @@ msgid "" - "partition is too large for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" -+"particija je prevelika za %(format)s formatiranje (dopuštena veličina je od " -+"%(min_size)s do %(max_size)s)" - - #: ../blivet/partitioning.py:962 - msgid "Unable to allocate requested partition scheme." --msgstr "" -+msgstr "Nemoguće premještanje zahtijevane sheme particije." - - #: ../blivet/partitioning.py:997 - msgid "not enough free space after creating extended partition" --msgstr "" -+msgstr "nedovoljno slobodnog prostora nakon stvaranja proširene particije" - - #: ../blivet/partitioning.py:1004 - msgid "failed to allocate aligned partition" --msgstr "" -+msgstr "neuspjelo premještanje poravnane particije" - - #: ../blivet/partitioning.py:1205 - msgid "cannot reclaim more than request has grown" --msgstr "" -+msgstr "nemoguć povrat više od porasta zahtjeva" - - #: ../blivet/partitioning.py:1419 - msgid "DiskChunk requests must be of type PartitionRequest" --msgstr "" -+msgstr "DiskChunk zahtjev mora biti vrste PartitionRequest" - - #: ../blivet/partitioning.py:1432 - msgid "partitions allocated outside disklabel limits" --msgstr "" -+msgstr "particije su premještene izvan granica oznake diska" - - #: ../blivet/partitioning.py:1517 - msgid "VGChunk requests must be of type LVRequest" --msgstr "" -+msgstr "VGChunk zahtjev mora biti vrste LVRequest" - - #. by now we have allocated the PVs so if there isn't enough - #. space in the VG we have a real problem - #: ../blivet/partitioning.py:2025 - msgid "not enough space for LVM requests" --msgstr "" -+msgstr "nedovoljno prostora za ULU zahtjev" - - #: ../blivet/deviceaction.py:194 - #, python-format - msgid "Executing %(action)s" --msgstr "" -+msgstr "Pokretanje %(action)s" - - #: ../blivet/deviceaction.py:322 - msgid "create device" --msgstr "" -+msgstr "stvori uređaj" - - #: ../blivet/deviceaction.py:381 - msgid "destroy device" --msgstr "" -+msgstr "uništi uređaj" - - #: ../blivet/deviceaction.py:484 - msgid "resize device" --msgstr "" -+msgstr "promijeni veličinu uređaja" - - #: ../blivet/deviceaction.py:573 - msgid "create format" --msgstr "" -+msgstr "stvori formatiranje" - - #: ../blivet/deviceaction.py:613 - #, python-format - msgid "Creating %(type)s on %(device)s" --msgstr "" -+msgstr "Stvaranje %(type)s na %(device)s" - - #: ../blivet/deviceaction.py:640 - #, python-format - msgid "Not enough entropy to create LUKS format. %d bits are needed." --msgstr "" -+msgstr "Nedovoljno entropije za stvaranje LUKS formata. %d bita je potrebno." - - #: ../blivet/deviceaction.py:670 - #, python-format - msgid "Created %(type)s on %(device)s" --msgstr "" -+msgstr "Stvoren je %(type)s na %(device)s" - - #: ../blivet/deviceaction.py:717 - msgid "destroy format" --msgstr "" -+msgstr "uništi format" - - #: ../blivet/deviceaction.py:830 - msgid "resize format" --msgstr "" -+msgstr "promijeni veličinu formata" - - #: ../blivet/deviceaction.py:869 - #, python-format - msgid "Resizing filesystem on %(device)s" --msgstr "" -+msgstr "Promjena veličine datotečnog sustava na %(device)s" - - #: ../blivet/deviceaction.py:876 - #, python-format - msgid "Resized filesystem on %(device)s" --msgstr "" -+msgstr "Promijenjena je veličina na datotečnom sustavu %(device)s" - - #: ../blivet/deviceaction.py:923 - msgid "add container member" --msgstr "" -+msgstr "dodaj člana spremnika" - - #: ../blivet/deviceaction.py:988 - msgid "remove container member" --msgstr "" -+msgstr "ukloni člana spremnika" - - #: ../blivet/deviceaction.py:1058 - msgid "configure format" --msgstr "" -+msgstr "podesi format" - - #: ../blivet/deviceaction.py:1114 - msgid "configure device" --msgstr "" -+msgstr "podesi uređaj" - - #: ../blivet/devices/raid.py:58 - #, python-format -@@ -306,84 +333,94 @@ msgid_plural "" - "RAID level %(raid_level)s requires that device have at least %(min_members)d " - "members." - msgstr[0] "" -+"RAID razina %(raid_level)s zahtijeva da uređaj ima najmanje %(min_members)d " -+"član." -+msgstr[1] "" -+"RAID razina %(raid_level)s zahtijeva da uređaj ima najmanje %(min_members)d " -+"člana." -+msgstr[2] "" -+"RAID razina %(raid_level)s zahtijeva da uređaj ima najmanje %(min_members)d " -+"članova." - - #: ../blivet/devices/raid.py:79 - #, python-format - msgid "" - "RAID level %(raid_level)s is an invalid value. Must be one of (%(levels)s)." - msgstr "" -+"RAID razina %(raid_level)s je nevaljana vrijednost. Mora biti jedna od " -+"(%(levels)s)." - - #: ../blivet/devices/raid.py:104 - #, python-format - msgid "Cannot remove a member from existing %s array" --msgstr "" -+msgstr "Nemoguće uklanjanje člana iz postojećeg %s polja" - - #: ../blivet/formats/fs.py:932 - msgid "EFI System Partition" --msgstr "" -+msgstr "EFI particija sustava" - - #: ../blivet/formats/fs.py:1137 - msgid "Apple Bootstrap" --msgstr "" -+msgstr "Apple Bootstrap" - - #: ../blivet/formats/fs.py:1173 - msgid "Linux HFS+ ESP" --msgstr "" -+msgstr "Linux HFS+ ESP" - - #: ../blivet/formats/prepboot.py:37 - msgid "PPC PReP Boot" --msgstr "" -+msgstr "PPC PReP pokretanje" - - #: ../blivet/formats/luks.py:58 - msgid "LUKS" --msgstr "" -+msgstr "LUKS" - - #: ../blivet/formats/luks.py:59 - msgid "Encrypted" --msgstr "" -+msgstr "Šifrirano" - - #: ../blivet/formats/luks.py:388 - msgid "DM Integrity" --msgstr "" -+msgstr "DM integritet" - - #: ../blivet/formats/__init__.py:148 - msgid "Unknown" --msgstr "" -+msgstr "Nepoznato" - - #: ../blivet/formats/biosboot.py:35 - msgid "BIOS Boot" --msgstr "" -+msgstr "BIOS Boot" - - #: ../blivet/formats/dmraid.py:37 - msgid "dm-raid member device" --msgstr "" -+msgstr "dm-raid član uređaja" - - #: ../blivet/formats/disklabel.py:50 - msgid "partition table" --msgstr "" -+msgstr "particijska tabilica" - - #. Translators: Name for an unsupported disklabel; e.g. "Unsupported partition table" - #: ../blivet/formats/disklabel.py:320 - #, python-format - msgid "Unsupported %(name)s" --msgstr "" -+msgstr "Nepodržan %(name)s" - - #: ../blivet/formats/mdraid.py:43 - msgid "software RAID" --msgstr "" -+msgstr "softverski RAID" - - #: ../blivet/formats/multipath.py:40 - msgid "multipath member device" --msgstr "" -+msgstr "član uređaja s više putanja" - - #: ../blivet/formats/lvmpv.py:49 - msgid "physical volume (LVM)" --msgstr "" -+msgstr "fizički uređaj (ULU)" - - #: ../blivet/devicelibs/lvm.py:59 - msgid "Generic" --msgstr "" -+msgstr "Izvorno" - - #: ../blivet/devicelibs/lvm.py:60 - msgid "Performance" --msgstr "" -+msgstr "Performanse" -diff --git a/po/hu.po b/po/hu.po -index 4509889..b9e2674 100644 ---- a/po/hu.po -+++ b/po/hu.po -@@ -16,22 +16,21 @@ - # Zoltan Hoppár , 2011-2013 - # Meskó Balázs , 2018. #zanata - # Meskó Balázs , 2019. #zanata --# Balázs Meskó , 2020. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-07-21 14:29+0000\n" --"Last-Translator: Balázs Meskó \n" --"Language-Team: Hungarian \n" -+"PO-Revision-Date: 2019-08-22 01:56+0000\n" -+"Last-Translator: Meskó Balázs \n" -+"Language-Team: Hungarian (http://www.transifex.com/projects/p/blivet/" -+"language/hu/)\n" - "Language: hu\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=2; plural=n != 1;\n" --"X-Generator: Weblate 4.1.1\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Zanata 4.6.2\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -104,7 +103,7 @@ msgstr "A(z) %(devnum)s zFCP eszköz nem állítható be elérhetővé (%(e)s) . - msgid "Could not add WWPN %(wwpn)s to zFCP device %(devnum)s (%(e)s)." - msgstr "" - "Hiba: Nem lehet %(wwpn)s WWPN-t hozzáadni a zFCP eszközhöz: %(devnum)s " --"(%(e)s)." -+"(%(e)s). " - - #. newer zfcp sysfs interface with auto port scan - #: ../blivet/zfcp.py:119 -@@ -119,7 +118,7 @@ msgid "" - "(%(e)s)." - msgstr "" - "A(z) %(fcplun)s LUN nem adható hozzá a(z) %(wwpn)s WWPN zFCP eszközhöz: " --"%(devnum)s (%(e)s)." -+"%(devnum)s (%(e)s). " - - #: ../blivet/zfcp.py:140 - #, python-format -@@ -136,7 +135,7 @@ msgid "" - "device %(devnum)s (%(e)s)." - msgstr "" - "Nem sikerült a hibás %(fcplun)s LUN attribútum kiolvasása a(z) %(wwpn)s WWPN-" --"en, a(z) %(devnum)s zFCP eszközön (%(e)s)." -+"en, a(z) %(devnum)s zFCP eszközön (%(e)s). " - - #: ../blivet/zfcp.py:161 - #, python-format -@@ -154,7 +153,7 @@ msgid "" - "%(fcplun)s (%(e)s)." - msgstr "" - "A SCSI eszköz nem törölhető helyesen: zFCP %(devnum)s %(wwpn)s %(fcplun)s " --"(%(e)s)." -+"(%(e)s). " - - #: ../blivet/zfcp.py:227 - #, python-format -@@ -162,8 +161,8 @@ msgid "" - "Could not remove LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s " - "(%(e)s)." - msgstr "" --"A(z) %(fcplun)s LUN nem távolítható el a(z) %(wwpn)s WWPN-en, a(z) %(devnum)" --"s zFCP eszközön (%(e)s)." -+"A(z) %(fcplun)s LUN nem távolítható el a(z) %(wwpn)s WWPN-en, a(z) " -+"%(devnum)s zFCP eszközön (%(e)s). " - - #: ../blivet/zfcp.py:245 - #, python-format -@@ -296,7 +295,7 @@ msgstr "formátum létrehozása" - #: ../blivet/deviceaction.py:613 - #, python-format - msgid "Creating %(type)s on %(device)s" --msgstr "%(type)s létrehozása itt: %(device)s" -+msgstr "%(type)s létrehozása itt: %(device)s " - - #: ../blivet/deviceaction.py:640 - #, python-format -diff --git a/po/id.po b/po/id.po -index 9ca8eae..c03d606 100644 ---- a/po/id.po -+++ b/po/id.po -@@ -3,7 +3,7 @@ - # This file is distributed under the same license as the PACKAGE package. - # - # Translators: --# Andika Triwidada , 2012, 2020. -+# Andika Triwidada , 2012 - # Arif Tri Waluyo , 2011-2012 - # clumens , 2011 - # dcantrel , 2011 -@@ -17,16 +17,16 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-12-29 12:36+0000\n" -+"PO-Revision-Date: 2021-10-24 02:05+0000\n" - "Last-Translator: Andika Triwidada \n" - "Language-Team: Indonesian \n" -+"blivet/blivet-rhel9/id/>\n" - "Language: id\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.4\n" -+"X-Generator: Weblate 4.8\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -49,24 +49,23 @@ msgstr "" - "tepatnya. Harap laporkan bug pada http://bugzilla.redhat.com" - - #: ../blivet/errors.py:224 --#, fuzzy - msgid "" - "Either restore the disklabel to a completely working state or remove it " - "completely.\n" - "Hint: parted can restore it or wipefs can remove it." - msgstr "" --"Pulihkan disklabel ke keadaan yang berfungsi total atau hapus sepenuhnya.\n" --"Petunjuk: berpisah dapat memulihkannya atau wipef dapat menghapusnya." -+"Pulihkan disklabel ke keadaan yang sepenuhnya berfungsi atau hapus " -+"menyeluruh.\n" -+"Petunjuk: parted untuk memulihkan atau wipefs untuk menghapus." - - #: ../blivet/errors.py:230 --#, fuzzy - msgid "" - "Rename one of the volume groups so the names are distinct.\n" - "Hint 1: vgrename accepts UUID in place of the old name.\n" - "Hint 2: You can get the VG UUIDs by running 'pvs -o +vg_uuid'." - msgstr "" --"Ganti nama salah satu grup volume sehingga nama berbeda.\n" --"Petunjuk 1: vgrename menerima UUID menggantikan nama lama.\n" -+"Ganti nama salah satu grup volume sehingga namanya berbeda.\n" -+"Petunjuk 1: vgrename menerima UUID sebagai pengganti nama lama.\n" - "Petunjuk 2: Anda bisa mendapatkan UUID VG dengan menjalankan 'pvs -o " - "+vg_uuid'." - -@@ -190,33 +189,29 @@ msgid "No initiator name set" - msgstr "Tidak ada nama inisiator mengatur" - - #: ../blivet/iscsi.py:530 --#, fuzzy - msgid "No iSCSI nodes discovered" --msgstr "Tidak ada node iSCSI yang ditemukan" -+msgstr "Tidak ada simpul iSCSI yang ditemukan" - - #: ../blivet/iscsi.py:550 - msgid "No new iSCSI nodes discovered" - msgstr "Tidak ada node iSCSI baru yang ditemukan" - - #: ../blivet/iscsi.py:553 --#, fuzzy - msgid "Could not log in to any of the discovered nodes" --msgstr "Tak bisa log-masuk ke salah satu node yang ditemukan" -+msgstr "Tidak bisa log masuk ke salah satu simpul yang ditemukan" - - #: ../blivet/partitioning.py:454 --#, fuzzy - msgid "unable to allocate aligned partition" --msgstr "tidak dapat mengalokasikan partisi rata" -+msgstr "tidak dapat mengalokasikan partisi rata batas (aligned)" - - #: ../blivet/partitioning.py:462 --#, fuzzy - msgid "requested size exceeds maximum allowed" --msgstr "ukuran yang diminta melebihi maksimum yang diperbolehkan" -+msgstr "ukuran yang diminta melebihi ukuran maksimum yang diperbolehkan" - - #: ../blivet/partitioning.py:580 --#, fuzzy, python-format -+#, python-format - msgid "disk %s inaccessible" --msgstr "cakram %s dapat diakses" -+msgstr "disk %s tidak dapat diakses" - - #: ../blivet/partitioning.py:641 - #, python-format -@@ -228,7 +223,7 @@ msgstr "" - "diperbolehkan adalah %(min_size)s sampai %(max_size)s)" - - #: ../blivet/partitioning.py:646 --#, fuzzy, python-format -+#, python-format - msgid "" - "partition is too large for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" -@@ -237,44 +232,36 @@ msgstr "" - "diperbolehkan adalah %(min_size)s ke %(max_size)s)" - - #: ../blivet/partitioning.py:962 --#, fuzzy - msgid "Unable to allocate requested partition scheme." --msgstr "Tak bisa mengalokasikan skema partisi yang diminta." -+msgstr "Tidak bisa mengalokasikan skema partisi yang diminta." - - #: ../blivet/partitioning.py:997 --#, fuzzy - msgid "not enough free space after creating extended partition" - msgstr "tidak cukup ruang kosong setelah membuat partisi extended" - - #: ../blivet/partitioning.py:1004 --#, fuzzy - msgid "failed to allocate aligned partition" --msgstr "gagal mengalokasikan partisi aligned" -+msgstr "gagal mengalokasikan partisi yang rata batas (aligned)" - - #: ../blivet/partitioning.py:1205 --#, fuzzy - msgid "cannot reclaim more than request has grown" --msgstr "tidak dapat mengklaim kembali lebih dari permintaan telah tumbuh" -+msgstr "tidak dapat mengklaim kembali lebih dari membesarnya permintaan" - - #: ../blivet/partitioning.py:1419 --#, fuzzy - msgid "DiskChunk requests must be of type PartitionRequest" --msgstr "Permintaan DiskChunk harus dari tipe PartitionRequest" -+msgstr "Permintaan DiskChunk diharuskan dari tipe PartitionRequest" - - #: ../blivet/partitioning.py:1432 --#, fuzzy - msgid "partitions allocated outside disklabel limits" - msgstr "partisi dialokasikan di luar batas disklabel" - - #: ../blivet/partitioning.py:1517 --#, fuzzy - msgid "VGChunk requests must be of type LVRequest" --msgstr "Permintaan VGChunk harus tipe LVRequest" -+msgstr "Permintaan VGChunk harus bertipe LVRequest" - - #. by now we have allocated the PVs so if there isn't enough - #. space in the VG we have a real problem - #: ../blivet/partitioning.py:2025 --#, fuzzy - msgid "not enough space for LVM requests" - msgstr "tidak cukup ruang untuk permintaan LVM" - -@@ -284,24 +271,20 @@ msgid "Executing %(action)s" - msgstr "Mengeksekusi %(action)s" - - #: ../blivet/deviceaction.py:322 --#, fuzzy - msgid "create device" --msgstr "buat perangkat" -+msgstr "membuat perangkat" - - #: ../blivet/deviceaction.py:381 --#, fuzzy - msgid "destroy device" --msgstr "hancurkan perangkat" -+msgstr "menghancurkan perangkat" - - #: ../blivet/deviceaction.py:484 --#, fuzzy - msgid "resize device" - msgstr "mengubah ukuran perangkat" - - #: ../blivet/deviceaction.py:573 --#, fuzzy - msgid "create format" --msgstr "buat format" -+msgstr "membuat format" - - #: ../blivet/deviceaction.py:613 - #, python-format -@@ -309,7 +292,7 @@ msgid "Creating %(type)s on %(device)s" - msgstr "Membuat %(type)s pada %(device)s" - - #: ../blivet/deviceaction.py:640 --#, fuzzy, python-format -+#, python-format - msgid "Not enough entropy to create LUKS format. %d bits are needed." - msgstr "Tidak cukup entropi untuk membuat format LUKS. %d bit diperlukan." - -@@ -319,12 +302,10 @@ msgid "Created %(type)s on %(device)s" - msgstr "Dibuat %(type)s pada %(device)s" - - #: ../blivet/deviceaction.py:717 --#, fuzzy - msgid "destroy format" --msgstr "hancurkan format" -+msgstr "menghancurkan format" - - #: ../blivet/deviceaction.py:830 --#, fuzzy - msgid "resize format" - msgstr "mengubah ukuran format" - -@@ -339,27 +320,23 @@ msgid "Resized filesystem on %(device)s" - msgstr "Sistem berkas diubah ukuran pada %(device)s" - - #: ../blivet/deviceaction.py:923 --#, fuzzy - msgid "add container member" --msgstr "tambahkan anggota kontainer" -+msgstr "menambahkan anggota kontainer" - - #: ../blivet/deviceaction.py:988 --#, fuzzy - msgid "remove container member" --msgstr "hapus anggota kontainer" -+msgstr "menghapus anggota kontainer" - - #: ../blivet/deviceaction.py:1058 --#, fuzzy - msgid "configure format" --msgstr "konfigurasi format" -+msgstr "mengkonfigurasi format" - - #: ../blivet/deviceaction.py:1114 --#, fuzzy - msgid "configure device" --msgstr "konfigurasi perangkat" -+msgstr "mengkonfigurasi perangkat" - - #: ../blivet/devices/raid.py:58 --#, fuzzy, python-format -+#, python-format - msgid "" - "RAID level %(raid_level)s requires that device have at least %(min_members)d " - "member." -@@ -367,8 +344,8 @@ msgid_plural "" - "RAID level %(raid_level)s requires that device have at least %(min_members)d " - "members." - msgstr[0] "" --"Tingkat RAID %(raid_level)s mensyi mengharuskan perangkat memiliki " --"setidaknya %(min_members)d anggota." -+"Tingkat RAID %(raid_level)s mengharuskan perangkat memiliki setidaknya " -+"%(min_members)d anggota." - - #: ../blivet/devices/raid.py:79 - #, python-format -@@ -379,9 +356,9 @@ msgstr "" - "dari (%(levels)s)." - - #: ../blivet/devices/raid.py:104 --#, fuzzy, python-format -+#, python-format - msgid "Cannot remove a member from existing %s array" --msgstr "Tak bisa menghapus anggota dari array %s yang sudah ada" -+msgstr "Tidak bisa menghapus anggota dari array %s yang sudah ada" - - #: ../blivet/formats/fs.py:932 - msgid "EFI System Partition" -@@ -397,7 +374,7 @@ msgstr "Linux HFS+ ESP" - - #: ../blivet/formats/prepboot.py:37 - msgid "PPC PReP Boot" --msgstr "PPC PReP Boot" -+msgstr "Boot PPC PReP" - - #: ../blivet/formats/luks.py:58 - msgid "LUKS" -@@ -408,27 +385,22 @@ msgid "Encrypted" - msgstr "Enkripsi" - - #: ../blivet/formats/luks.py:388 --#, fuzzy - msgid "DM Integrity" - msgstr "Integritas DM" - - #: ../blivet/formats/__init__.py:148 --#, fuzzy - msgid "Unknown" --msgstr "Tak Dikenal" -+msgstr "Tidak Dikenal" - - #: ../blivet/formats/biosboot.py:35 --#, fuzzy - msgid "BIOS Boot" --msgstr "BIOS Boot" -+msgstr "Boot BIOS" - - #: ../blivet/formats/dmraid.py:37 --#, fuzzy - msgid "dm-raid member device" - msgstr "perangkat anggota dm-raid" - - #: ../blivet/formats/disklabel.py:50 --#, fuzzy - msgid "partition table" - msgstr "tabel partisi" - -@@ -439,22 +411,18 @@ msgid "Unsupported %(name)s" - msgstr "%(name)s yang tidak didukung" - - #: ../blivet/formats/mdraid.py:43 --#, fuzzy - msgid "software RAID" --msgstr "RAID Perangkat Lunak" -+msgstr "RAID perangkat lunak" - - #: ../blivet/formats/multipath.py:40 --#, fuzzy - msgid "multipath member device" - msgstr "perangkat anggota multipath" - - #: ../blivet/formats/lvmpv.py:49 --#, fuzzy - msgid "physical volume (LVM)" - msgstr "volume fisik (LVM)" - - #: ../blivet/devicelibs/lvm.py:59 --#, fuzzy - msgid "Generic" - msgstr "Generik" - -diff --git a/po/ja.po b/po/ja.po -index be46ed9..65a2fa8 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -30,16 +30,16 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2018-09-21 01:08+0000\n" --"Last-Translator: Copied by Zanata \n" --"Language-Team: Japanese (http://www.transifex.com/projects/p/blivet/language/" --"ja/)\n" -+"PO-Revision-Date: 2022-03-05 07:16+0000\n" -+"Last-Translator: Ludek Janda \n" -+"Language-Team: Japanese \n" - "Language: ja\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Zanata 4.6.2\n" -+"X-Generator: Weblate 4.11.2\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -47,6 +47,9 @@ msgid "" - "of the UUID value which should be unique. In that case you can either " - "disconnect one of the devices or reformat it." - msgstr "" -+"これは通常、デバイスイメージを複製したことで、一意であるはずのUUID値が重複す" -+"ることが原因です。その場合は、いずれかのデバイスを切断するか、再フォーマット" -+"してください。" - - #: ../blivet/errors.py:217 - msgid "" -@@ -56,7 +59,7 @@ msgid "" - msgstr "" - "なんらかの理由により、kernel がパーティションを報告しているディスク上でディス" - "クラベルを見つけられませんでした。何が問題となっているかは不明です。バグを " --"http://bugzilla.redhat.com に提出してください。" -+"http://bugzilla.redhat.com に提出してください" - - #: ../blivet/errors.py:224 - msgid "" -@@ -84,7 +87,7 @@ msgstr "FCoE は使用できません" - - #: ../blivet/zfcp.py:62 - msgid "You have not specified a device number or the number is invalid" --msgstr "デバイス番号を指定していないか番号が無効です。" -+msgstr "デバイス番号を指定していないか番号が無効です" - - #: ../blivet/zfcp.py:64 - msgid "You have not specified a worldwide port name or the name is invalid." -@@ -202,7 +205,7 @@ msgstr "iSCSI ノードが何も探索できませんでした" - - #: ../blivet/iscsi.py:550 - msgid "No new iSCSI nodes discovered" --msgstr "新しい iSCSI ノードは見つかりませんでした。" -+msgstr "新しい iSCSI ノードは見つかりませんでした" - - #: ../blivet/iscsi.py:553 - msgid "Could not log in to any of the discovered nodes" -@@ -257,7 +260,7 @@ msgstr "要求を超えたサイズを再利用することができません" - - #: ../blivet/partitioning.py:1419 - msgid "DiskChunk requests must be of type PartitionRequest" --msgstr "DiskChunk 要求には PartitionResquest タイプが必要です。" -+msgstr "DiskChunk 要求には PartitionResquest タイプが必要です" - - #: ../blivet/partitioning.py:1432 - msgid "partitions allocated outside disklabel limits" -@@ -265,7 +268,7 @@ msgstr "ディスクラベルの範囲外に割り当てられたパーティシ - - #: ../blivet/partitioning.py:1517 - msgid "VGChunk requests must be of type LVRequest" --msgstr "VGChunk 要求には LVResquest タイプが必要です。" -+msgstr "VGChunk 要求には LVResquest タイプが必要です" - - #. by now we have allocated the PVs so if there isn't enough - #. space in the VG we have a real problem -diff --git a/po/kk.po b/po/kk.po -index 015e3ce..a92a512 100644 ---- a/po/kk.po -+++ b/po/kk.po -@@ -3,22 +3,22 @@ - # This file is distributed under the same license as the PACKAGE package. - # - # Translators: --# Baurzhan Muftakhidinov , 2012-2014, 2020. -+# Baurzhan Muftakhidinov , 2012-2014 - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-07-12 13:27+0000\n" --"Last-Translator: Baurzhan Muftakhidinov \n" --"Language-Team: Kazakh \n" -+"PO-Revision-Date: 2015-01-05 05:25+0000\n" -+"Last-Translator: Copied by Zanata \n" -+"Language-Team: Kazakh (http://www.transifex.com/projects/p/blivet/language/" -+"kk/)\n" - "Language: kk\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.1.1\n" -+"X-Generator: Zanata 4.6.2\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -26,9 +26,6 @@ msgid "" - "of the UUID value which should be unique. In that case you can either " - "disconnect one of the devices or reformat it." - msgstr "" --"Бұл әдетте құрылғы бейнесін клондау салдарынан пайда болады, нәтижесінде " --"бірегей болуы тиіс UUID мәні қайталанады. Бұл жағдайда сіз құрылғылардың " --"біреуін ажыратуға немесе оны қайта пішімдеуге болады." - - #: ../blivet/errors.py:217 - msgid "" -diff --git a/po/ko.po b/po/ko.po -index a4d6d32..6c8dedd 100644 ---- a/po/ko.po -+++ b/po/ko.po -@@ -14,24 +14,23 @@ - # Michelle Ji Yeen Kim , 2005-2006 - # Michelle J Kim , 2003-2004 - # Michelle Kim , 2011 --# , 2011-2012 -+# , 2011-2012 - # Ludek Janda , 2018. #zanata --# simmon , 2021. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2021-04-29 10:02+0000\n" -+"PO-Revision-Date: 2021-11-08 10:05+0000\n" - "Last-Translator: simmon \n" - "Language-Team: Korean \n" -+"blivet-rhel9/ko/>\n" - "Language: ko\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.6\n" -+"X-Generator: Weblate 4.8\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -39,8 +38,8 @@ msgid "" - "of the UUID value which should be unique. In that case you can either " - "disconnect one of the devices or reformat it." - msgstr "" --"이는 일반적으로 고유한 UUID 값을 중복하는 결과로 장치 이미지 복제로 인해 발생합니다. 이와 같은 경우에 장치 중의 하나를 끊거나 " --"재구성 할 수 있습니다." -+"이는 일반적으로 장치 이미지 복제로 인해 고유한 UUID 값이 복제되기 때문에 발생합니다. 이 경우 장치 중 하나를 분리하거나 다시 포맷 " -+"할 수 있습니다." - - #: ../blivet/errors.py:217 - msgid "" -@@ -48,7 +47,7 @@ msgid "" - "kernel is reporting partitions on. It is unclear what the exact problem is. " - "Please file a bug at http://bugzilla.redhat.com" - msgstr "" --"일부 이유로 커널이 파티션 설정을 보고하는 디스크에 디스크 레이블을 배치 할 수 없습니다. 정확한 문제가 무엇인지 알 수 없습니다. " -+"일부 이유로 커널이 파티션 설정을 보고하는 디스크에 디스크 이름표를 배치 할 수 없습니다. 정확한 문제가 무엇인지 알 수 없습니다. " - "http://bugzilla.redhat.com에 결점(bug) 보고서를 제출해 주십시오" - - #: ../blivet/errors.py:224 -@@ -406,7 +405,7 @@ msgstr "소프트웨어 RAID" - - #: ../blivet/formats/multipath.py:40 - msgid "multipath member device" --msgstr "멀티패스 멤버 장치" -+msgstr "다중 경로 구성 장치" - - #: ../blivet/formats/lvmpv.py:49 - msgid "physical volume (LVM)" -diff --git a/po/pt.po b/po/pt.po -index 8438146..eee541a 100644 ---- a/po/pt.po -+++ b/po/pt.po -@@ -8,22 +8,21 @@ - # Miguel Sousa , 2012 - # Ricardo Pinto , 2011 - # Rui Gouveia , 2011-2012 --# Pedro Flores , 2021. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2021-03-14 17:01+0000\n" --"Last-Translator: Pedro Flores \n" --"Language-Team: Portuguese \n" -+"PO-Revision-Date: 2015-01-05 05:26+0000\n" -+"Last-Translator: Copied by Zanata \n" -+"Language-Team: Portuguese (http://www.transifex.com/projects/p/blivet/" -+"language/pt/)\n" - "Language: pt\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Weblate 4.5.1\n" -+"X-Generator: Zanata 4.6.2\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -31,9 +30,6 @@ msgid "" - "of the UUID value which should be unique. In that case you can either " - "disconnect one of the devices or reformat it." - msgstr "" --"Isto ocorre normalmente ao clonar a imagem do dispositivo que resulta na " --"duplicação do valor UUID que deve ser único. Nesse caso pode desligar um dos " --"dispositivos ou reformatá-lo." - - #: ../blivet/errors.py:217 - msgid "" -@@ -41,9 +37,6 @@ msgid "" - "kernel is reporting partitions on. It is unclear what the exact problem is. " - "Please file a bug at http://bugzilla.redhat.com" - msgstr "" --"Por alguma razão não fomos capazes de localizar uma etiqueta de disco num " --"disco onde o kernel está a reportar partições em. Não é sabido qual é o " --"problema exato. Por favor crie um bug em http://bugzilla.redhat.com" - - #: ../blivet/errors.py:224 - msgid "" -@@ -51,9 +44,6 @@ msgid "" - "completely.\n" - "Hint: parted can restore it or wipefs can remove it." - msgstr "" --"Ou restaure a etiqueta do disco para um estado funcional ou remova-a " --"completamente.\n" --"Dica: o parted pode restaurá-la ou o wipefs pode removê-la." - - #: ../blivet/errors.py:230 - msgid "" -@@ -61,9 +51,6 @@ msgid "" - "Hint 1: vgrename accepts UUID in place of the old name.\n" - "Hint 2: You can get the VG UUIDs by running 'pvs -o +vg_uuid'." - msgstr "" --"Renomeie um dos volumes de grupo para que os nomes sejam distintos.\n" --"Dica 1: vgrename aceita UUID no lugar do nome antigo.\n" --"Dica 2: Pode obter os UUIDs dos volumes de grupo ao correr 'pvs -o +vg_uuid'." - - #: ../blivet/fcoe.py:121 - msgid "FCoE not available" -@@ -190,7 +177,7 @@ msgstr "Nome do iniciador não configurado" - - #: ../blivet/iscsi.py:530 - msgid "No iSCSI nodes discovered" --msgstr "Não foram encontrados novos nós iSCCI" -+msgstr "" - - #: ../blivet/iscsi.py:550 - msgid "No new iSCSI nodes discovered" -@@ -198,20 +185,20 @@ msgstr "Não foram encontrados novos nós iSCCI" - - #: ../blivet/iscsi.py:553 - msgid "Could not log in to any of the discovered nodes" --msgstr "Não foi possível iniciar sessão em nenhum dos nós descobertos" -+msgstr "" - - #: ../blivet/partitioning.py:454 - msgid "unable to allocate aligned partition" --msgstr "impossível alocar partição alinhada" -+msgstr "" - - #: ../blivet/partitioning.py:462 - msgid "requested size exceeds maximum allowed" --msgstr "tamanho pedido excede o máximo permitido" -+msgstr "" - - #: ../blivet/partitioning.py:580 - #, python-format - msgid "disk %s inaccessible" --msgstr "disco %s inacessível" -+msgstr "" - - #: ../blivet/partitioning.py:641 - #, python-format -@@ -219,8 +206,6 @@ msgid "" - "partition is too small for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" --"a partição é pequena demais para o formato %(format)s (o tamanho permitido é " --"%(min_size)s a %(max_size)s)" - - #: ../blivet/partitioning.py:646 - #, python-format -@@ -228,63 +213,61 @@ msgid "" - "partition is too large for %(format)s formatting (allowable size is " - "%(min_size)s to %(max_size)s)" - msgstr "" --"a partição é grande demais para o formato %(format)s (o tamanho permitido é " --"%(min_size)s a %(max_size)s)" - - #: ../blivet/partitioning.py:962 - msgid "Unable to allocate requested partition scheme." --msgstr "Impossível alocar o esquema de partições pedido." -+msgstr "" - - #: ../blivet/partitioning.py:997 - msgid "not enough free space after creating extended partition" --msgstr "não há espaço livre suficiente após a criação da partição estendida" -+msgstr "" - - #: ../blivet/partitioning.py:1004 - msgid "failed to allocate aligned partition" --msgstr "falhou a alocação da partição alinhada" -+msgstr "" - - #: ../blivet/partitioning.py:1205 - msgid "cannot reclaim more than request has grown" --msgstr "não é possível reclamar mais do que o pedido cresceu" -+msgstr "" - - #: ../blivet/partitioning.py:1419 - msgid "DiskChunk requests must be of type PartitionRequest" --msgstr "Pedidos DiskChunk devem ser do tipo PartitionRequest" -+msgstr "" - - #: ../blivet/partitioning.py:1432 - msgid "partitions allocated outside disklabel limits" --msgstr "partições alocadas fora dos limites da etiqueta de disco" -+msgstr "" - - #: ../blivet/partitioning.py:1517 - msgid "VGChunk requests must be of type LVRequest" --msgstr "Pedidos VGChunk devem ser do tipo LVRequest" -+msgstr "" - - #. by now we have allocated the PVs so if there isn't enough - #. space in the VG we have a real problem - #: ../blivet/partitioning.py:2025 - msgid "not enough space for LVM requests" --msgstr "não há espaço suficiente para pedidos LVM" -+msgstr "" - - #: ../blivet/deviceaction.py:194 - #, python-format - msgid "Executing %(action)s" --msgstr "A executar %(action)s" -+msgstr "" - - #: ../blivet/deviceaction.py:322 - msgid "create device" --msgstr "criar dispositivo" -+msgstr "" - - #: ../blivet/deviceaction.py:381 - msgid "destroy device" --msgstr "destruir dispositivo" -+msgstr "" - - #: ../blivet/deviceaction.py:484 - msgid "resize device" --msgstr "redimensionar dispositivo" -+msgstr "" - - #: ../blivet/deviceaction.py:573 - msgid "create format" --msgstr "criar formato" -+msgstr "" - - #: ../blivet/deviceaction.py:613 - #, python-format -@@ -294,46 +277,46 @@ msgstr "A criar %(type)s em %(device)s" - #: ../blivet/deviceaction.py:640 - #, python-format - msgid "Not enough entropy to create LUKS format. %d bits are needed." --msgstr "Entropia insuficiente para criar formato LUKS. %d bits são necessários." -+msgstr "" - - #: ../blivet/deviceaction.py:670 - #, python-format - msgid "Created %(type)s on %(device)s" --msgstr "Criado %(type)s em %(device)s" -+msgstr "" - - #: ../blivet/deviceaction.py:717 - msgid "destroy format" --msgstr "destruir formato" -+msgstr "" - - #: ../blivet/deviceaction.py:830 - msgid "resize format" --msgstr "redimensionar formato" -+msgstr "" - - #: ../blivet/deviceaction.py:869 - #, python-format - msgid "Resizing filesystem on %(device)s" --msgstr "A redimensionar sistema de ficheiros em %(device)s" -+msgstr "" - - #: ../blivet/deviceaction.py:876 - #, python-format - msgid "Resized filesystem on %(device)s" --msgstr "Sistema de ficheiros redimensionado em %(device)s" -+msgstr "" - - #: ../blivet/deviceaction.py:923 - msgid "add container member" --msgstr "adicionar membro do contentor" -+msgstr "" - - #: ../blivet/deviceaction.py:988 - msgid "remove container member" --msgstr "remover membro do contentor" -+msgstr "" - - #: ../blivet/deviceaction.py:1058 - msgid "configure format" --msgstr "configurar formato" -+msgstr "" - - #: ../blivet/deviceaction.py:1114 - msgid "configure device" --msgstr "configurar dispositivo" -+msgstr "" - - #: ../blivet/devices/raid.py:58 - #, python-format -@@ -344,24 +327,17 @@ msgid_plural "" - "RAID level %(raid_level)s requires that device have at least %(min_members)d " - "members." - msgstr[0] "" --"Nível RAID %(raid_level)s requer que o dispositivo tenha pelo menos " --"%(min_members)d membro." --msgstr[1] "" --"Nível RAID %(raid_level)s requer que o dispositivo tenha pelo menos " --"%(min_members)d membros." - - #: ../blivet/devices/raid.py:79 - #, python-format - msgid "" - "RAID level %(raid_level)s is an invalid value. Must be one of (%(levels)s)." - msgstr "" --"Nível RAID %(raid_level)s é inválido. Tem que ser um dos seguintes " --"(%(levels)s)." - - #: ../blivet/devices/raid.py:104 - #, python-format - msgid "Cannot remove a member from existing %s array" --msgstr "Não pode remover um membro de um array %s" -+msgstr "" - - #: ../blivet/formats/fs.py:932 - msgid "EFI System Partition" -@@ -369,19 +345,19 @@ msgstr "Partição do Sistema EFI" - - #: ../blivet/formats/fs.py:1137 - msgid "Apple Bootstrap" --msgstr "Apple Bootstrap" -+msgstr "" - - #: ../blivet/formats/fs.py:1173 - msgid "Linux HFS+ ESP" --msgstr "Linux HFS+ ESP" -+msgstr "" - - #: ../blivet/formats/prepboot.py:37 - msgid "PPC PReP Boot" --msgstr "PPC PReP Boot" -+msgstr "" - - #: ../blivet/formats/luks.py:58 - msgid "LUKS" --msgstr "LUKS" -+msgstr "" - - #: ../blivet/formats/luks.py:59 - msgid "Encrypted" -@@ -389,46 +365,46 @@ msgstr "Cifrado" - - #: ../blivet/formats/luks.py:388 - msgid "DM Integrity" --msgstr "Integridade DM" -+msgstr "" - - #: ../blivet/formats/__init__.py:148 - msgid "Unknown" --msgstr "Desconhecido" -+msgstr "" - - #: ../blivet/formats/biosboot.py:35 - msgid "BIOS Boot" --msgstr "Arranque BIOS" -+msgstr "" - - #: ../blivet/formats/dmraid.py:37 - msgid "dm-raid member device" --msgstr "dispositivo membro dm-raid" -+msgstr "" - - #: ../blivet/formats/disklabel.py:50 - msgid "partition table" --msgstr "tabela de partições" -+msgstr "" - - #. Translators: Name for an unsupported disklabel; e.g. "Unsupported partition table" - #: ../blivet/formats/disklabel.py:320 - #, python-format - msgid "Unsupported %(name)s" --msgstr "%(name)s não suportado" -+msgstr "" - - #: ../blivet/formats/mdraid.py:43 - msgid "software RAID" --msgstr "RAID por software" -+msgstr "" - - #: ../blivet/formats/multipath.py:40 - msgid "multipath member device" --msgstr "dispositivo membro multicaminho" -+msgstr "" - - #: ../blivet/formats/lvmpv.py:49 - msgid "physical volume (LVM)" --msgstr "volume físico (LVM)" -+msgstr "" - - #: ../blivet/devicelibs/lvm.py:59 - msgid "Generic" --msgstr "Genérico" -+msgstr "" - - #: ../blivet/devicelibs/lvm.py:60 - msgid "Performance" --msgstr "Desempenho" -+msgstr "" -diff --git a/po/sv.po b/po/sv.po -index 64a72e4..f81ef32 100644 ---- a/po/sv.po -+++ b/po/sv.po -@@ -4,21 +4,21 @@ - # - # Translators: - # Dimitris Glezos , 2011 --# Göran Uddeborg , 2011-2012, 2020. -+# Göran Uddeborg , 2011-2012 - # fedoratrans , 2007 - # Ulrika , 2012 --# Göran Uddeborg , 2015. #zanata, 2020. --# Göran Uddeborg , 2016. #zanata, 2020. --# Göran Uddeborg , 2018. #zanata, 2020. --# Göran Uddeborg , 2019. #zanata, 2020. -+# Göran Uddeborg , 2015. #zanata -+# Göran Uddeborg , 2016. #zanata -+# Göran Uddeborg , 2018. #zanata -+# Göran Uddeborg , 2019. #zanata - # Allan Nordhøy , 2020. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-09-12 15:29+0000\n" --"Last-Translator: Göran Uddeborg \n" -+"PO-Revision-Date: 2020-05-21 05:40+0000\n" -+"Last-Translator: Allan Nordhøy \n" - "Language-Team: Swedish \n" - "Language: sv\n" -@@ -26,7 +26,7 @@ msgstr "" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" --"X-Generator: Weblate 4.2.2\n" -+"X-Generator: Weblate 4.0.4\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -45,7 +45,7 @@ msgid "" - "Please file a bug at http://bugzilla.redhat.com" - msgstr "" - "Av någon anledning kunde vi inte hitta en disketikett på en disk som kärnan " --"rapporterar partitioner på. Det är oklart vad det precisa problemet är. " -+"rapporterar partitioner på. Det är oklart vad det precisa problemet är. " - "Rapportera gärna felet på http://bugzilla.redhat.com" - - #: ../blivet/errors.py:224 -diff --git a/po/tr.po b/po/tr.po -index 43083d8..d32e964 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -1,7 +1,7 @@ - # SOME DESCRIPTIVE TITLE. - # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER - # This file is distributed under the same license as the PACKAGE package. --# -+# - # Translators: - # Bahadir Yagan , 2004 - # dcantrel , 2011 -@@ -18,16 +18,16 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-09-15 19:29+0000\n" -+"PO-Revision-Date: 2021-09-05 20:04+0000\n" - "Last-Translator: Oğuz Ersen \n" - "Language-Team: Turkish \n" -+"blivet-rhel9/tr/>\n" - "Language: tr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n>1);\n" --"X-Generator: Weblate 4.2.2\n" -+"X-Generator: Weblate 4.8\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -238,7 +238,7 @@ msgstr "genişletilmiş bölüm oluşturduktan sonra yeterli boş alan yok" - - #: ../blivet/partitioning.py:1004 - msgid "failed to allocate aligned partition" --msgstr "hizalanmış bölüm ayırma başarısız oldu" -+msgstr "hizalanmış bölüm ayrılamadı" - - #: ../blivet/partitioning.py:1205 - msgid "cannot reclaim more than request has grown" -diff --git a/po/uk.po b/po/uk.po -index 0f02035..d8192e6 100644 ---- a/po/uk.po -+++ b/po/uk.po -@@ -18,17 +18,17 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-04-01 11:38+0000\n" --"Last-Translator: Petr Molodyk \n" -+"PO-Revision-Date: 2021-09-06 21:04+0000\n" -+"Last-Translator: Yuri Chornoivan \n" - "Language-Team: Ukrainian \n" -+"blivet/blivet-rhel9/uk/>\n" - "Language: uk\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" --"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" --"X-Generator: Weblate 3.11.3\n" -+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -+"X-Generator: Weblate 4.8\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -394,7 +394,7 @@ msgstr "Шифрований" - - #: ../blivet/formats/luks.py:388 - msgid "DM Integrity" --msgstr "DM Integrity" -+msgstr "Цілісність DM" - - #: ../blivet/formats/__init__.py:148 - msgid "Unknown" -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 0c488fc..c5f1d8f 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -16,22 +16,21 @@ - # xiaofeng , 2012 - # yusuf , 2011 - # Ludek Janda , 2018. #zanata --# Charles Lee , 2020. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2020-01-29 14:04+0100\n" --"PO-Revision-Date: 2020-08-02 07:29+0000\n" --"Last-Translator: Charles Lee \n" -+"PO-Revision-Date: 2022-03-05 07:16+0000\n" -+"Last-Translator: Ludek Janda \n" - "Language-Team: Chinese (Simplified) \n" -+"projects/blivet/blivet-rhel9/zh_CN/>\n" - "Language: zh_CN\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.1.1\n" -+"X-Generator: Weblate 4.11.2\n" - - #: ../blivet/errors.py:210 - msgid "" -@@ -46,7 +45,8 @@ msgid "" - "kernel is reporting partitions on. It is unclear what the exact problem is. " - "Please file a bug at http://bugzilla.redhat.com" - msgstr "" --"由于某些原因我们无法在磁盘上定位内核所报告分区的磁盘标签。尚不了解具体问题所在。请在 http://bugzilla.redhat.com 提交 bug" -+"由于某些原因，我们无法对内核正在报告其上分区的磁盘定位磁盘标签。尚不了解具体" -+"问题所在。请在http://bugzilla.redhat.com 提交bug" - - #: ../blivet/errors.py:224 - msgid "" diff --git a/SOURCES/0019-Do-not-crash-when-changing-disklabel-on-disks-with-a.patch b/SOURCES/0019-Do-not-crash-when-changing-disklabel-on-disks-with-a.patch new file mode 100644 index 0000000..0d58051 --- /dev/null +++ b/SOURCES/0019-Do-not-crash-when-changing-disklabel-on-disks-with-a.patch @@ -0,0 +1,41 @@ +From 72ace5d66b567baefde10ff9c4197054830067f1 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 28 Apr 2022 14:13:04 +0200 +Subject: [PATCH] Do not crash when changing disklabel on disks with active + devices + +The _find_active_devices_on_action_disks function originally +prevented from making any changes on disks with active devices +(active LVs, mounted partitions etc.) This was changed in +b72e957d2b23444824316331ae21d1c594371e9c and the check currently +prevents only reformatting the disklabel on such disks which +should be already impossible on disks with an existing partition. + +This change for the 3.4 stable branch keeps the current behaviour +where the active devices are teared down when running in installer +mode to avoid potential issues with the installer. + +Resolves: rhbz#2078803 +--- + blivet/actionlist.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/blivet/actionlist.py b/blivet/actionlist.py +index f3977401..9c06228b 100644 +--- a/blivet/actionlist.py ++++ b/blivet/actionlist.py +@@ -211,9 +211,8 @@ class ActionList(object): + except StorageError as e: + log.info("teardown of %s failed: %s", device.name, e) + else: +- raise RuntimeError("partitions in use on disks with changes " +- "pending: %s" % +- ",".join(problematic)) ++ log.debug("ignoring devices in use on disks with changes: %s", ++ ",".join(problematic)) + + log.info("resetting parted disks...") + for device in devices: +-- +2.34.3 + diff --git a/SOURCES/0020-ActionDestroyDevice-should-not-obsolete-ActionRemove.patch b/SOURCES/0020-ActionDestroyDevice-should-not-obsolete-ActionRemove.patch new file mode 100644 index 0000000..2eb4c94 --- /dev/null +++ b/SOURCES/0020-ActionDestroyDevice-should-not-obsolete-ActionRemove.patch @@ -0,0 +1,65 @@ +From 070b33c1a80e5740abd7878118a23eaaca1e3460 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 13 Apr 2022 15:43:45 +0200 +Subject: [PATCH] ActionDestroyDevice should not obsolete ActionRemoveMember + +If we want to remove a PV from a VG and then remove the PV device, +the ActionDestroyDevice must not obsolete the ActionRemoveMember +action. Eventhough we are going to remove the device, we still +need to call "vgreduce" first. + +Resolves: rhbz#2076956 +--- + blivet/deviceaction.py | 10 +++++----- + tests/action_test.py | 7 +++++++ + 2 files changed, 12 insertions(+), 5 deletions(-) + +diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py +index 0458e4be..78e113bf 100644 +--- a/blivet/deviceaction.py ++++ b/blivet/deviceaction.py +@@ -463,8 +463,8 @@ class ActionDestroyDevice(DeviceAction): + - obsoletes all actions w/ lower id that act on the same device, + including self, if device does not exist + +- - obsoletes all but ActionDestroyFormat actions w/ lower id on the +- same device if device exists ++ - obsoletes all but ActionDestroyFormat and ActionRemoveMember actions ++ w/ lower id on the same device if device exists + + - obsoletes all actions that add a member to this action's + (container) device +@@ -474,9 +474,9 @@ class ActionDestroyDevice(DeviceAction): + if action.device.id == self.device.id: + if self.id >= action.id and not self.device.exists: + rc = True +- elif self.id > action.id and \ +- self.device.exists and \ +- not (action.is_destroy and action.is_format): ++ elif self.id > action.id and self.device.exists and \ ++ not ((action.is_destroy and action.is_format) or ++ action.is_remove): + rc = True + elif action.is_add and (action.device == self.device): + rc = True +diff --git a/tests/action_test.py b/tests/action_test.py +index 8509ce35..626b9b49 100644 +--- a/tests/action_test.py ++++ b/tests/action_test.py +@@ -1197,6 +1197,13 @@ class DeviceActionTestCase(StorageTestCase): + self.assertEqual(create_sdc2.requires(remove_sdc1), False) + self.assertEqual(remove_sdc1.requires(create_sdc2), False) + ++ # destroy sdc1, the ActionRemoveMember should not be obsoleted ++ sdc1.exists = True ++ destroy_sdc1 = ActionDestroyDevice(sdc1) ++ destroy_sdc1.apply() ++ self.assertFalse(destroy_sdc1.obsoletes(remove_sdc1)) ++ self.assertTrue(destroy_sdc1.requires(remove_sdc1)) ++ + def test_action_sorting(self, *args, **kwargs): + """ Verify correct functioning of action sorting. """ + +-- +2.34.3 + diff --git a/SOURCES/0021-Correctly-set-vg_name-after-adding-removing-a-PV-fro.patch b/SOURCES/0021-Correctly-set-vg_name-after-adding-removing-a-PV-fro.patch new file mode 100644 index 0000000..aa79b78 --- /dev/null +++ b/SOURCES/0021-Correctly-set-vg_name-after-adding-removing-a-PV-fro.patch @@ -0,0 +1,63 @@ +From ea5054b0cab19f3fe09d7010f8721e7f18ae399e Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Mon, 2 May 2022 15:30:16 +0200 +Subject: [PATCH] Correctly set vg_name after adding/removing a PV from a VG + +Without setting the LVMPhysicalVolume.vg_name argument to None +after removing the PV from its VG, the PV is still considered +active and cannot be removed. + +Resolves: rhbz#2081278 +--- + blivet/devices/lvm.py | 3 +++ + tests/devices_test/lvm_test.py | 13 +++++++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py +index 9c230f1b..a971da8e 100644 +--- a/blivet/devices/lvm.py ++++ b/blivet/devices/lvm.py +@@ -385,6 +385,8 @@ class LVMVolumeGroupDevice(ContainerDevice): + if not parent.format.exists: + parent.format.free = self._get_pv_usable_space(parent) + ++ parent.format.vg_name = self.name ++ + def _remove_parent(self, parent): + # XXX It would be nice to raise an exception if removing this member + # would not leave enough space, but the devicefactory relies on it +@@ -395,6 +397,7 @@ class LVMVolumeGroupDevice(ContainerDevice): + super(LVMVolumeGroupDevice, self)._remove_parent(parent) + parent.format.free = None + parent.format.container_uuid = None ++ parent.format.vg_name = None + + # We can't rely on lvm to tell us about our size, free space, &c + # since we could have modifications queued, unless the VG and all of +diff --git a/tests/devices_test/lvm_test.py b/tests/devices_test/lvm_test.py +index 5efa369e..59c027da 100644 +--- a/tests/devices_test/lvm_test.py ++++ b/tests/devices_test/lvm_test.py +@@ -454,6 +454,19 @@ class LVMDeviceTest(unittest.TestCase): + pool.autoset_md_size(enforced=True) + self.assertEqual(pool.chunk_size, Size("128 KiB")) + ++ def test_add_remove_pv(self): ++ pv1 = StorageDevice("pv1", fmt=blivet.formats.get_format("lvmpv"), ++ size=Size("1024 MiB")) ++ pv2 = StorageDevice("pv2", fmt=blivet.formats.get_format("lvmpv"), ++ size=Size("1024 MiB")) ++ vg = LVMVolumeGroupDevice("testvg", parents=[pv1]) ++ ++ vg._add_parent(pv2) ++ self.assertEqual(pv2.format.vg_name, vg.name) ++ ++ vg._remove_parent(pv2) ++ self.assertEqual(pv2.format.vg_name, None) ++ + + class TypeSpecificCallsTest(unittest.TestCase): + def test_type_specific_calls(self): +-- +2.34.3 + diff --git a/SOURCES/0022-Add-support-for-creating-LVM-cache-pools.patch b/SOURCES/0022-Add-support-for-creating-LVM-cache-pools.patch new file mode 100644 index 0000000..5cf99f4 --- /dev/null +++ b/SOURCES/0022-Add-support-for-creating-LVM-cache-pools.patch @@ -0,0 +1,588 @@ +From 08f0e12c74e4c2ba25629fe92108283dd5ae3ff3 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 30 Dec 2021 16:08:43 +0100 +Subject: [PATCH 1/4] Add support for creating LVM cache pools + +Resolves: rhbz#2055200 +--- + blivet/blivet.py | 9 +- + blivet/devicelibs/lvm.py | 9 ++ + blivet/devices/lvm.py | 160 +++++++++++++++++++++++++++++++-- + tests/devices_test/lvm_test.py | 26 ++++++ + 4 files changed, 196 insertions(+), 8 deletions(-) + +diff --git a/blivet/blivet.py b/blivet/blivet.py +index c6908eb0..d29fadd0 100644 +--- a/blivet/blivet.py ++++ b/blivet/blivet.py +@@ -576,6 +576,8 @@ class Blivet(object): + :type vdo_pool: bool + :keyword vdo_lv: whether to create a vdo lv + :type vdo_lv: bool ++ :keyword cache_pool: whether to create a cache pool ++ :type cache_pool: bool + :returns: the new device + :rtype: :class:`~.devices.LVMLogicalVolumeDevice` + +@@ -594,6 +596,7 @@ class Blivet(object): + thin_pool = kwargs.pop("thin_pool", False) + vdo_pool = kwargs.pop("vdo_pool", False) + vdo_lv = kwargs.pop("vdo_lv", False) ++ cache_pool = kwargs.pop("cache_pool", False) + parent = kwargs.get("parents", [None])[0] + if (thin_volume or vdo_lv) and parent: + # kwargs["parents"] will contain the pool device, so... +@@ -609,6 +612,8 @@ class Blivet(object): + kwargs["seg_type"] = "vdo-pool" + if vdo_lv: + kwargs["seg_type"] = "vdo" ++ if cache_pool: ++ kwargs["seg_type"] = "cache-pool" + + mountpoint = kwargs.pop("mountpoint", None) + if 'fmt_type' in kwargs: +@@ -640,7 +645,7 @@ class Blivet(object): + swap = False + + prefix = "" +- if thin_pool or vdo_pool: ++ if thin_pool or vdo_pool or cache_pool: + prefix = "pool" + + name = self.suggest_device_name(parent=vg, +@@ -651,7 +656,7 @@ class Blivet(object): + if "%s-%s" % (vg.name, name) in self.names: + raise ValueError("name '%s' is already in use" % name) + +- if thin_pool or thin_volume or vdo_pool or vdo_lv: ++ if thin_pool or thin_volume or vdo_pool or vdo_lv or cache_pool: + cache_req = kwargs.pop("cache_request", None) + if cache_req: + raise ValueError("Creating cached thin and VDO volumes and pools is not supported") +diff --git a/blivet/devicelibs/lvm.py b/blivet/devicelibs/lvm.py +index bbde6303..23935009 100644 +--- a/blivet/devicelibs/lvm.py ++++ b/blivet/devicelibs/lvm.py +@@ -54,6 +54,11 @@ LVM_THINP_MIN_CHUNK_SIZE = Size("64 KiB") + LVM_THINP_MAX_CHUNK_SIZE = Size("1 GiB") + LVM_THINP_ADDRESSABLE_CHUNK_SIZE = Size("17455015526400 B") # 15.88 TiB + ++# cache constants ++LVM_CACHE_MIN_METADATA_SIZE = Size("8 MiB") ++LVM_CACHE_MAX_METADATA_SIZE = Size("16 GiB") ++LVM_CACHE_DEFAULT_MODE = blockdev.LVMCacheMode.WRITETHROUGH ++ + raid_levels = raid.RAIDLevels(["linear", "striped", "raid1", "raid4", "raid5", "raid6", "raid10"]) + raid_seg_types = list(itertools.chain.from_iterable([level.names for level in raid_levels if level.name != "linear"])) + +@@ -248,3 +253,7 @@ def recommend_thpool_chunk_size(thpool_size): + # for every ~15.88 TiB of thinpool data size + return min(math.ceil(thpool_size / LVM_THINP_ADDRESSABLE_CHUNK_SIZE) * LVM_THINP_MIN_CHUNK_SIZE, + LVM_THINP_MAX_CHUNK_SIZE) ++ ++ ++def is_valid_cache_md_size(md_size): ++ return md_size >= LVM_CACHE_MIN_METADATA_SIZE and md_size <= LVM_CACHE_MAX_METADATA_SIZE +diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py +index a971da8e..7cb482ab 100644 +--- a/blivet/devices/lvm.py ++++ b/blivet/devices/lvm.py +@@ -43,6 +43,7 @@ from .. import util + from ..storage_log import log_method_call + from .. import udev + from ..size import Size, KiB, MiB, ROUND_UP, ROUND_DOWN ++from ..static_data.lvm_info import lvs_info + from ..tasks import availability + + import logging +@@ -646,7 +647,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice): + percent=None, cache_request=None, pvs=None, from_lvs=None): + + if not exists: +- if seg_type not in [None, "linear", "thin", "thin-pool", "cache", "vdo-pool", "vdo"] + lvm.raid_seg_types: ++ 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 ValueError("List of PVs has to be given for every non-linear LV") +@@ -690,8 +691,8 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice): + # we reserve space for it + self._metadata_size = self.vg.pe_size + self._size -= self._metadata_size +- elif self.seg_type == "thin-pool": +- # LVMThinPoolMixin sets self._metadata_size on its own ++ elif self.seg_type in ("thin-pool", "cache_pool"): ++ # LVMThinPoolMixin and LVMCachePoolMixin set self._metadata_size on their own + if not self.exists and not from_lvs and not grow: + # a thin pool we are not going to grow -> lets calculate metadata + # size now if not given explicitly +@@ -1619,7 +1620,6 @@ class LVMThinPoolMixin(object): + """ A list of this pool's LVs """ + return self._lvs[:] # we don't want folks changing our list + +- @util.requires_property("is_thin_pool") + def autoset_md_size(self, enforced=False): + """ If self._metadata_size not set already, it calculates the recommended value + and sets it while subtracting the size from self.size. +@@ -2032,9 +2032,142 @@ class LVMVDOLogicalVolumeMixin(object): + self.pool._add_log_vol(self) + + ++class LVMCachePoolMixin(object): ++ def __init__(self, metadata_size, cache_mode=None): ++ self._metadata_size = metadata_size or Size(0) ++ self._cache_mode = cache_mode ++ ++ def _init_check(self): ++ if not self.is_cache_pool: ++ return ++ ++ if self._metadata_size and not lvm.is_valid_cache_md_size(self._metadata_size): ++ raise ValueError("invalid metadatasize value") ++ ++ if not self.exists and not self._pv_specs: ++ raise ValueError("at least one fast PV must be specified to create a cache pool") ++ ++ def _check_from_lvs(self): ++ if self._from_lvs: ++ if len(self._from_lvs) != 2: ++ raise errors.DeviceError("two LVs required to create a cache pool") ++ ++ def _convert_from_lvs(self): ++ data_lv, metadata_lv = self._from_lvs ++ ++ data_lv.parent_lv = self # also adds the LV to self._internal_lvs ++ data_lv.int_lv_type = LVMInternalLVtype.data ++ metadata_lv.parent_lv = self ++ metadata_lv.int_lv_type = LVMInternalLVtype.meta ++ ++ self.size = data_lv.size ++ ++ @property ++ def is_cache_pool(self): ++ return self.seg_type == "cache-pool" ++ ++ @property ++ def profile(self): ++ return self._profile ++ ++ @property ++ def type(self): ++ return "lvmcachepool" ++ ++ @property ++ def resizable(self): ++ return False ++ ++ def read_current_size(self): ++ log_method_call(self, exists=self.exists, path=self.path, ++ sysfs_path=self.sysfs_path) ++ if self.size != Size(0): ++ return self.size ++ ++ if self.exists: ++ # cache pools are not active and don't have th device mapper mapping ++ # so we can't get this from sysfs ++ lv_info = lvs_info.cache.get(self.name) ++ if lv_info is None: ++ log.error("Failed to get size for existing cache pool '%s'", self.name) ++ return Size(0) ++ else: ++ return Size(lv_info.size) ++ ++ return Size(0) ++ ++ def autoset_md_size(self, enforced=False): ++ """ If self._metadata_size not set already, it calculates the recommended value ++ and sets it while subtracting the size from self.size. ++ ++ """ ++ ++ log.debug("Auto-setting cache pool metadata size") ++ ++ if self._size <= Size(0): ++ log.debug("Cache pool size not bigger than 0, just setting metadata size to 0") ++ self._metadata_size = 0 ++ return ++ ++ old_md_size = self._metadata_size ++ if self._metadata_size == 0 or enforced: ++ self._metadata_size = blockdev.lvm.cache_get_default_md_size(self._size) ++ log.debug("Using recommended metadata size: %s", self._metadata_size) ++ ++ self._metadata_size = self.vg.align(self._metadata_size, roundup=True) ++ log.debug("Rounded metadata size to extents: %s MiB", self._metadata_size.convert_to("MiB")) ++ ++ if self._metadata_size == old_md_size: ++ log.debug("Rounded metadata size unchanged") ++ else: ++ new_size = self.size - (self._metadata_size - old_md_size) ++ log.debug("Adjusting size from %s MiB to %s MiB", ++ self.size.convert_to("MiB"), new_size.convert_to("MiB")) ++ self.size = new_size ++ ++ def _pre_create(self): ++ # make sure all the LVs this LV should be created from exist (if any) ++ if self._from_lvs and any(not lv.exists for lv in self._from_lvs): ++ raise errors.DeviceError("Component LVs need to be created first") ++ ++ def _create(self): ++ """ Create the device. """ ++ log_method_call(self, self.name, status=self.status) ++ if self._cache_mode: ++ try: ++ cache_mode = blockdev.lvm.cache_get_mode_from_str(self._cache_mode) ++ except blockdev.LVMError as e: ++ raise errors.DeviceError from e ++ else: ++ cache_mode = lvm.LVM_CACHE_DEFAULT_MODE ++ ++ if self._from_lvs: ++ extra = dict() ++ if self.mode: ++ # we need the string here, it will be passed directly to he lvm command ++ extra["cachemode"] = self._cache_mode ++ data_lv = six.next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.data) ++ meta_lv = six.next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.meta) ++ blockdev.lvm.cache_pool_convert(self.vg.name, data_lv.lvname, meta_lv.lvname, self.lvname, **extra) ++ else: ++ blockdev.lvm.cache_create_pool(self.vg.name, self.lvname, self.size, ++ self.metadata_size, ++ cache_mode, ++ 0, ++ [spec.pv.path for spec in self._pv_specs]) ++ ++ def dracut_setup_args(self): ++ return set() ++ ++ @property ++ def direct(self): ++ """ Is this device directly accessible? """ ++ return False ++ ++ + class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin, LVMSnapshotMixin, + LVMThinPoolMixin, LVMThinLogicalVolumeMixin, LVMVDOPoolMixin, +- LVMVDOLogicalVolumeMixin): ++ LVMVDOLogicalVolumeMixin, LVMCachePoolMixin): + """ An LVM Logical Volume """ + + # generally resizable, see :property:`resizable` for details +@@ -2046,7 +2179,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): ++ write_policy=None, cache_mode=None): + """ + :param name: the device name (generally a device node's basename) + :type name: str +@@ -2116,6 +2249,13 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin + :keyword write_policy: write policy for the volume or None for default + :type write_policy: str + ++ For cache pools only: ++ ++ :keyword metadata_size: the size of the metadata LV ++ :type metadata_size: :class:`~.size.Size` ++ :keyword cache_mode: mode for the cache or None for default (writethrough) ++ :type cache_mode: str ++ + """ + + if isinstance(parents, (list, ParentList)): +@@ -2133,6 +2273,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin + LVMSnapshotMixin.__init__(self, origin, vorigin) + LVMThinPoolMixin.__init__(self, metadata_size, chunk_size, profile) + LVMThinLogicalVolumeMixin.__init__(self) ++ LVMCachePoolMixin.__init__(self, metadata_size, cache_mode) + LVMLogicalVolumeBase.__init__(self, name, parents, size, uuid, seg_type, + fmt, exists, sysfs_path, grow, maxsize, + percent, cache_request, pvs, from_lvs) +@@ -2144,6 +2285,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin + LVMSnapshotMixin._init_check(self) + LVMThinPoolMixin._init_check(self) + LVMThinLogicalVolumeMixin._init_check(self) ++ LVMCachePoolMixin._init_check(self) + + if self._from_lvs: + self._check_from_lvs() +@@ -2169,6 +2311,8 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin + ret.append(LVMVDOPoolMixin) + if self.is_vdo_lv: + ret.append(LVMVDOLogicalVolumeMixin) ++ if self.is_cache_pool: ++ ret.append(LVMCachePoolMixin) + return ret + + def _try_specific_call(self, name, *args, **kwargs): +@@ -2552,6 +2696,10 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin + + return True + ++ @type_specific ++ def autoset_md_size(self, enforced=False): ++ pass ++ + def attach_cache(self, cache_pool_lv): + if self.is_thin_lv or self.is_snapshot_lv or self.is_internal_lv: + raise errors.DeviceError("Cannot attach a cache pool to the '%s' LV" % self.name) +diff --git a/tests/devices_test/lvm_test.py b/tests/devices_test/lvm_test.py +index 59c027da..0105bcae 100644 +--- a/tests/devices_test/lvm_test.py ++++ b/tests/devices_test/lvm_test.py +@@ -868,3 +868,29 @@ class BlivetLVMVDODependenciesTest(unittest.TestCase): + + vdo_supported = devicefactory.is_supported_device_type(devicefactory.DEVICE_TYPE_LVM_VDO) + self.assertFalse(vdo_supported) ++ ++ ++@unittest.skipUnless(not any(x.unavailable_type_dependencies() for x in DEVICE_CLASSES), "some unsupported device classes required for this test") ++class BlivetNewLVMCachePoolDeviceTest(unittest.TestCase): ++ ++ def test_new_cache_pool(self): ++ b = blivet.Blivet() ++ pv = StorageDevice("pv1", fmt=blivet.formats.get_format("lvmpv"), ++ size=Size("10 GiB"), exists=True) ++ vg = LVMVolumeGroupDevice("testvg", parents=[pv], exists=True) ++ ++ for dev in (pv, vg): ++ b.devicetree._add_device(dev) ++ ++ # check that all the above devices are in the expected places ++ self.assertEqual(set(b.devices), {pv, vg}) ++ self.assertEqual(set(b.vgs), {vg}) ++ ++ self.assertEqual(vg.size, Size("10236 MiB")) ++ ++ cachepool = b.new_lv(name="cachepool", cache_pool=True, ++ parents=[vg], pvs=[pv]) ++ ++ b.create_device(cachepool) ++ ++ self.assertEqual(cachepool.type, "lvmcachepool") +-- +2.34.3 + + +From bfb0e71a92f46baae098370207640962c97d8e77 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 30 Dec 2021 16:09:04 +0100 +Subject: [PATCH 2/4] examples: Add LVM cache pool example + +Related: rhbz#2055200 +--- + examples/lvm_cachepool.py | 59 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + create mode 100644 examples/lvm_cachepool.py + +diff --git a/examples/lvm_cachepool.py b/examples/lvm_cachepool.py +new file mode 100644 +index 00000000..ab2e8a72 +--- /dev/null ++++ b/examples/lvm_cachepool.py +@@ -0,0 +1,59 @@ ++import os ++ ++import blivet ++from blivet.size import Size ++from blivet.util import set_up_logging, create_sparse_tempfile ++ ++ ++set_up_logging() ++b = blivet.Blivet() # create an instance of Blivet (don't add system devices) ++ ++# create a disk image file on which to create new devices ++disk1_file = create_sparse_tempfile("disk1", Size("100GiB")) ++b.disk_images["disk1"] = disk1_file ++disk2_file = create_sparse_tempfile("disk2", Size("100GiB")) ++b.disk_images["disk2"] = disk2_file ++ ++b.reset() ++ ++try: ++ disk1 = b.devicetree.get_device_by_name("disk1") ++ disk2 = b.devicetree.get_device_by_name("disk2") ++ ++ b.initialize_disk(disk1) ++ b.initialize_disk(disk2) ++ ++ pv = b.new_partition(size=Size("50GiB"), fmt_type="lvmpv", parents=[disk1]) ++ b.create_device(pv) ++ pv2 = b.new_partition(size=Size("50GiB"), fmt_type="lvmpv", parents=[disk2]) ++ b.create_device(pv2) ++ ++ # allocate the partitions (decide where and on which disks they'll reside) ++ blivet.partitioning.do_partitioning(b) ++ ++ vg = b.new_vg(parents=[pv, pv2]) ++ b.create_device(vg) ++ ++ # new lv with base size 5GiB and growth up to 15GiB and an ext4 filesystem ++ lv = b.new_lv(fmt_type="ext4", size=Size("5GiB"), parents=[vg], name="cached") ++ b.create_device(lv) ++ ++ # new cache pool ++ cpool = b.new_lv(size=Size("1 GiB"), parents=[vg], pvs=[pv2], cache_pool=True, name="fastlv") ++ b.create_device(cpool) ++ ++ # write the new partitions to disk and format them as specified ++ b.do_it() ++ print(b.devicetree) ++ ++ # attach the newly created cache pool to the "slow" LV ++ lv.attach_cache(cpool) ++ ++ b.reset() ++ print(b.devicetree) ++ ++ input("Check the state and hit ENTER to trigger cleanup") ++finally: ++ b.devicetree.teardown_disk_images() ++ os.unlink(disk1_file) ++ os.unlink(disk2_file) +-- +2.34.3 + + +From 1fece0e7f15f7b0d457d3db876d23c3272df09bd Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 30 Dec 2021 16:13:33 +0100 +Subject: [PATCH 3/4] lvm: Use blivet static data when checking if the VG is + active + +Instead of calling 'lvs' again in LVMVolumeGroupDevice.status + +Related: rhbz#2055200 +--- + blivet/devices/lvm.py | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py +index 7cb482ab..12d3d073 100644 +--- a/blivet/devices/lvm.py ++++ b/blivet/devices/lvm.py +@@ -220,13 +220,8 @@ class LVMVolumeGroupDevice(ContainerDevice): + + # special handling for incomplete VGs + if not self.complete: +- try: +- lvs_info = blockdev.lvm.lvs(vg_name=self.name) +- except blockdev.LVMError: +- lvs_info = [] +- +- for lv_info in lvs_info: +- if lv_info.attr and lv_info.attr[4] == 'a': ++ for lv_info in lvs_info.cache.values(): ++ if lv_info.vg_name == self.name and lv_info.attr and lv_info.attr[4] == 'a': + return True + + return False +-- +2.34.3 + + +From 8d957f04c2d5f56386b978d1bf890450f38ad108 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Mon, 30 May 2022 17:02:43 +0200 +Subject: [PATCH 4/4] Add option to attach a newly created cache pool to + existing LV + +Because we do not have action for attaching the cache pool, we +cannot schedule both adding the fast PV to the VG and attaching +the cache pool to existing LV. This hack allows to schedule the +attach to happen after the cache pool is created. + +Related: rhbz#2055200 +--- + blivet/devices/lvm.py | 38 +++++++++++++++++++++++++++++++++++--- + 1 file changed, 35 insertions(+), 3 deletions(-) + +diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py +index 12d3d073..feb92f2e 100644 +--- a/blivet/devices/lvm.py ++++ b/blivet/devices/lvm.py +@@ -2028,9 +2028,10 @@ class LVMVDOLogicalVolumeMixin(object): + + + class LVMCachePoolMixin(object): +- def __init__(self, metadata_size, cache_mode=None): ++ def __init__(self, metadata_size, cache_mode=None, attach_to=None): + self._metadata_size = metadata_size or Size(0) + self._cache_mode = cache_mode ++ self._attach_to = attach_to + + def _init_check(self): + if not self.is_cache_pool: +@@ -2042,6 +2043,9 @@ class LVMCachePoolMixin(object): + if not self.exists and not self._pv_specs: + raise ValueError("at least one fast PV must be specified to create a cache pool") + ++ if self._attach_to and not self._attach_to.exists: ++ raise ValueError("cache pool can be attached only to an existing LV") ++ + def _check_from_lvs(self): + if self._from_lvs: + if len(self._from_lvs) != 2: +@@ -2150,6 +2154,31 @@ class LVMCachePoolMixin(object): + cache_mode, + 0, + [spec.pv.path for spec in self._pv_specs]) ++ if self._attach_to: ++ self._attach_to.attach_cache(self) ++ ++ def _post_create(self): ++ if self._attach_to: ++ # post_create tries to activate the LV and after attaching it no longer exists ++ return ++ ++ # pylint: disable=bad-super-call ++ super(LVMLogicalVolumeBase, self)._post_create() ++ ++ def add_hook(self, new=True): ++ if self._attach_to: ++ self._attach_to._cache = LVMCache(self._attach_to, size=self.size, exists=False, ++ pvs=self._pv_specs, mode=self._cache_mode) ++ ++ # pylint: disable=bad-super-call ++ super(LVMLogicalVolumeBase, self).add_hook(new=new) ++ ++ def remove_hook(self, modparent=True): ++ if self._attach_to: ++ self._attach_to._cache = None ++ ++ # pylint: disable=bad-super-call ++ super(LVMLogicalVolumeBase, self).remove_hook(modparent=modparent) + + def dracut_setup_args(self): + return set() +@@ -2174,7 +2203,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): ++ write_policy=None, cache_mode=None, attach_to=None): + """ + :param name: the device name (generally a device node's basename) + :type name: str +@@ -2250,6 +2279,9 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin + :type metadata_size: :class:`~.size.Size` + :keyword cache_mode: mode for the cache or None for default (writethrough) + :type cache_mode: str ++ :keyword attach_to: for non-existing cache pools a logical volume the pool should ++ be attached to when created ++ :type attach_to: :class:`LVMLogicalVolumeDevice` + + """ + +@@ -2268,7 +2300,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin + LVMSnapshotMixin.__init__(self, origin, vorigin) + LVMThinPoolMixin.__init__(self, metadata_size, chunk_size, profile) + LVMThinLogicalVolumeMixin.__init__(self) +- LVMCachePoolMixin.__init__(self, metadata_size, cache_mode) ++ 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) +-- +2.34.3 + diff --git a/SOURCES/0023-Use-LVM-PV-format-current_size-in-LVMVolumeGroupDevi.patch b/SOURCES/0023-Use-LVM-PV-format-current_size-in-LVMVolumeGroupDevi.patch new file mode 100644 index 0000000..59e40e4 --- /dev/null +++ b/SOURCES/0023-Use-LVM-PV-format-current_size-in-LVMVolumeGroupDevi.patch @@ -0,0 +1,29 @@ +From 4103df5ddaae49d51640d01502e8456409a92be9 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 5 May 2022 16:35:37 +0200 +Subject: [PATCH] Use LVM PV format current_size in + LVMVolumeGroupDevice._remove + +The member format size is 0 when target size is not set. + +Related: rhbz#2081278 +--- + blivet/devices/lvm.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py +index feb92f2e..facb1b76 100644 +--- a/blivet/devices/lvm.py ++++ b/blivet/devices/lvm.py +@@ -289,7 +289,7 @@ class LVMVolumeGroupDevice(ContainerDevice): + + # do not run pvmove on empty PVs + member.format.update_size_info() +- if member.format.free < member.format.size: ++ if member.format.free < member.format.current_size: + blockdev.lvm.pvmove(member.path) + blockdev.lvm.vgreduce(self.name, member.path) + +-- +2.34.3 + diff --git a/SOURCES/0024-tests-Mark-fake-disks-in-test_get_related_disks-as-n.patch b/SOURCES/0024-tests-Mark-fake-disks-in-test_get_related_disks-as-n.patch new file mode 100644 index 0000000..6b52a0d --- /dev/null +++ b/SOURCES/0024-tests-Mark-fake-disks-in-test_get_related_disks-as-n.patch @@ -0,0 +1,36 @@ +From a709c4db1bcf2e7ff69158a54ed3a1ea92ba4f97 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 14 Oct 2021 08:48:05 +0200 +Subject: [PATCH] tests: Mark "fake" disks in test_get_related_disks as + non-existing + +We are using "real" disk names ("sda", "sdb"...) in this test so +we need to avoid reading their real sizes which we do for existing +devices using os.stat. The test can fail if we have a disk with +the same name and small (or zero) size. + +Resolves: rhbz#2062690 +--- + tests/devicetree_test.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/devicetree_test.py b/tests/devicetree_test.py +index 3be4d572..c1b97c52 100644 +--- a/tests/devicetree_test.py ++++ b/tests/devicetree_test.py +@@ -406,9 +406,9 @@ class DeviceTreeTestCase(unittest.TestCase): + def test_get_related_disks(self): + tree = DeviceTree() + +- sda = DiskDevice("sda", size=Size('300g')) +- sdb = DiskDevice("sdb", size=Size('300g')) +- sdc = DiskDevice("sdc", size=Size('300G')) ++ sda = DiskDevice("sda", size=Size('300g'), exists=False) ++ sdb = DiskDevice("sdb", size=Size('300g'), exists=False) ++ sdc = DiskDevice("sdc", size=Size('300G'), exists=False) + + tree._add_device(sda) + tree._add_device(sdb) +-- +2.34.3 + diff --git a/SOURCES/0025-Add-support-for-NPIV-enabled-zFCP-devices.patch b/SOURCES/0025-Add-support-for-NPIV-enabled-zFCP-devices.patch new file mode 100644 index 0000000..25d5898 --- /dev/null +++ b/SOURCES/0025-Add-support-for-NPIV-enabled-zFCP-devices.patch @@ -0,0 +1,789 @@ +From 35643156c511c8120f2d562c1664a3c7a5a48cfb Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Thu, 28 Oct 2021 21:17:25 +0200 +Subject: [PATCH 1/8] Fix removing zFCP SCSI devices + +Values parsed from /proc/scsi/scsi were not correctly used to assemble +paths to SCSI devices. + +For example: +/sys/bus/scsi/devices/0:0:00:00/ +was incorrectly accessed instead of: +/sys/bus/scsi/devices/0:0:0:0/ + +Switch to a more reliable way of listing the available SCSI devices. + +Related: rhbz#1937030 +--- + blivet/zfcp.py | 17 ++++------------- + 1 file changed, 4 insertions(+), 13 deletions(-) + +diff --git a/blivet/zfcp.py b/blivet/zfcp.py +index 93af5419..3747290e 100644 +--- a/blivet/zfcp.py ++++ b/blivet/zfcp.py +@@ -20,6 +20,7 @@ + # + + import os ++import re + from . import udev + from . import util + from .i18n import _ +@@ -167,20 +168,10 @@ class ZFCPDevice: + return True + + def offline_scsi_device(self): +- f = open("/proc/scsi/scsi", "r") +- lines = f.readlines() +- f.close() +- # alternatively iterate over /sys/bus/scsi/devices/*:0:*:*/ ++ # A list of existing SCSI devices in format Host:Bus:Target:Lun ++ scsi_devices = [f for f in os.listdir(scsidevsysfs) if re.search(r'^[0-9]+:[0-9]+:[0-9]+:[0-9]+$', f)] + +- for line in lines: +- if not line.startswith("Host"): +- continue +- scsihost = line.split() +- host = scsihost[1] +- channel = "0" +- devid = scsihost[5] +- lun = scsihost[7] +- scsidev = "%s:%s:%s:%s" % (host[4:], channel, devid, lun) ++ for scsidev in scsi_devices: + fcpsysfs = "%s/%s" % (scsidevsysfs, scsidev) + scsidel = "%s/%s/delete" % (scsidevsysfs, scsidev) + +-- +2.34.3 + + +From 771cbf623030b1fa51ec193a2b5e2db229420a7a Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Sun, 21 Nov 2021 02:47:45 +0100 +Subject: [PATCH 2/8] Refactor the ZFCPDevice class + +Add a new base class for zFCP devices. +Move code to the new base class. +Improve documentation. + +Related: rhbz#1937030 +--- + blivet/zfcp.py | 131 +++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 95 insertions(+), 36 deletions(-) + +diff --git a/blivet/zfcp.py b/blivet/zfcp.py +index 3747290e..4a50f65f 100644 +--- a/blivet/zfcp.py ++++ b/blivet/zfcp.py +@@ -21,6 +21,7 @@ + + import os + import re ++from abc import ABC + from . import udev + from . import util + from .i18n import _ +@@ -46,29 +47,19 @@ zfcpsysfs = "/sys/bus/ccw/drivers/zfcp" + scsidevsysfs = "/sys/bus/scsi/devices" + zfcpconf = "/etc/zfcp.conf" + ++class ZFCPDeviceBase(ABC): ++ """An abstract base class for zFCP storage devices.""" + +-class ZFCPDevice: +- """ +- .. warning:: +- Since this is a singleton class, calling deepcopy() on the instance +- just returns ``self`` with no copy being created. +- """ +- +- def __init__(self, devnum, wwpn, fcplun): ++ def __init__(self, devnum): + self.devnum = blockdev.s390.sanitize_dev_input(devnum) +- self.wwpn = blockdev.s390.zfcp_sanitize_wwpn_input(wwpn) +- self.fcplun = blockdev.s390.zfcp_sanitize_lun_input(fcplun) +- + if not self.devnum: + raise ValueError(_("You have not specified a device number or the number is invalid")) +- if not self.wwpn: +- raise ValueError(_("You have not specified a worldwide port name or the name is invalid.")) +- if not self.fcplun: +- raise ValueError(_("You have not specified a FCP LUN or the number is invalid.")) ++ ++ self._device_online_path = os.path.join(zfcpsysfs, self.devnum, "online") + + # Force str and unicode types in case any of the properties are unicode + def _to_string(self): +- return "%s %s %s" % (self.devnum, self.wwpn, self.fcplun) ++ return str(self.devnum) + + def __str__(self): + return stringize(self._to_string()) +@@ -76,33 +67,97 @@ class ZFCPDevice: + def __unicode__(self): + return unicodeize(self._to_string()) + +- def online_device(self): +- online = "%s/%s/online" % (zfcpsysfs, self.devnum) +- portadd = "%s/%s/port_add" % (zfcpsysfs, self.devnum) +- portdir = "%s/%s/%s" % (zfcpsysfs, self.devnum, self.wwpn) +- unitadd = "%s/unit_add" % (portdir) +- unitdir = "%s/%s" % (portdir, self.fcplun) +- failed = "%s/failed" % (unitdir) ++ def _free_device(self): ++ """Remove the device from the I/O ignore list to make it visible to the system. ++ ++ :raises: ValueError if the device cannot be removed from the I/O ignore list ++ """ + +- if not os.path.exists(online): ++ if not os.path.exists(self._device_online_path): + log.info("Freeing zFCP device %s", self.devnum) + util.run_program(["zfcp_cio_free", "-d", self.devnum]) + +- if not os.path.exists(online): ++ if not os.path.exists(self._device_online_path): + raise ValueError(_("zFCP device %s not found, not even in device ignore list.") % + (self.devnum,)) + ++ def _set_zfcp_device_online(self): ++ """Set the zFCP device online. ++ ++ :raises: ValueError if the device cannot be set online ++ """ ++ + try: +- f = open(online, "r") +- devonline = f.readline().strip() +- f.close() ++ with open(self._device_online_path) as f: ++ devonline = f.readline().strip() + if devonline != "1": +- logged_write_line_to_file(online, "1") ++ logged_write_line_to_file(self._device_online_path, "1") + except OSError as e: + raise ValueError(_("Could not set zFCP device %(devnum)s " + "online (%(e)s).") + % {'devnum': self.devnum, 'e': e}) + ++ def _set_zfcp_device_offline(self): ++ """Set the zFCP device offline. ++ ++ :raises: ValueError if the device cannot be set offline ++ """ ++ ++ try: ++ logged_write_line_to_file(self._device_online_path, "0") ++ except OSError as e: ++ raise ValueError(_("Could not set zFCP device %(devnum)s " ++ "offline (%(e)s).") ++ % {'devnum': self.devnum, 'e': e}) ++ ++ def online_device(self): ++ """Initialize the device and make its storage block device(s) ready to use. ++ ++ :returns: True if success ++ :raises: ValueError if the device cannot be initialized ++ """ ++ ++ self._free_device() ++ self._set_zfcp_device_online() ++ return True ++ ++ ++class ZFCPDevice(ZFCPDeviceBase): ++ """A class for zFCP devices that are not configured in NPIV mode. Such ++ devices have to be specified by a device number, WWPN and LUN. ++ """ ++ ++ def __init__(self, devnum, wwpn, fcplun): ++ super().__init__(devnum) ++ ++ self.wwpn = blockdev.s390.zfcp_sanitize_wwpn_input(wwpn) ++ if not self.wwpn: ++ raise ValueError(_("You have not specified a worldwide port name or the name is invalid.")) ++ ++ self.fcplun = blockdev.s390.zfcp_sanitize_lun_input(fcplun) ++ if not self.fcplun: ++ raise ValueError(_("You have not specified a FCP LUN or the number is invalid.")) ++ ++ # Force str and unicode types in case any of the properties are unicode ++ def _to_string(self): ++ return "{} {} {}".format(self.devnum, self.wwpn, self.fcplun) ++ ++ def online_device(self): ++ """Initialize the device and make its storage block device(s) ready to use. ++ ++ :returns: True if success ++ :raises: ValueError if the device cannot be initialized ++ """ ++ ++ super().online_device() ++ ++ portadd = "%s/%s/port_add" % (zfcpsysfs, self.devnum) ++ portdir = "%s/%s/%s" % (zfcpsysfs, self.devnum, self.wwpn) ++ unitadd = "%s/unit_add" % (portdir) ++ unitdir = "%s/%s" % (portdir, self.fcplun) ++ failed = "%s/failed" % (unitdir) ++ ++ # create the sysfs directory for the WWPN/port + if not os.path.exists(portdir): + if os.path.exists(portadd): + # older zfcp sysfs interface +@@ -127,6 +182,7 @@ class ZFCPDevice: + "there.", {'wwpn': self.wwpn, + 'devnum': self.devnum}) + ++ # create the sysfs directory for the LUN/unit + if not os.path.exists(unitdir): + try: + logged_write_line_to_file(unitadd, self.fcplun) +@@ -144,6 +200,7 @@ class ZFCPDevice: + 'wwpn': self.wwpn, + 'devnum': self.devnum}) + ++ # check the state of the LUN + fail = "0" + try: + f = open(failed, "r") +@@ -168,6 +225,8 @@ class ZFCPDevice: + return True + + def offline_scsi_device(self): ++ """Find SCSI devices associated to the zFCP device and remove them from the system.""" ++ + # A list of existing SCSI devices in format Host:Bus:Target:Lun + scsi_devices = [f for f in os.listdir(scsidevsysfs) if re.search(r'^[0-9]+:[0-9]+:[0-9]+:[0-9]+$', f)] + +@@ -196,7 +255,8 @@ class ZFCPDevice: + self.devnum, self.wwpn, self.fcplun) + + def offline_device(self): +- offline = "%s/%s/online" % (zfcpsysfs, self.devnum) ++ """Remove the zFCP device from the system.""" ++ + portadd = "%s/%s/port_add" % (zfcpsysfs, self.devnum) + portremove = "%s/%s/port_remove" % (zfcpsysfs, self.devnum) + unitremove = "%s/%s/%s/unit_remove" % (zfcpsysfs, self.devnum, self.wwpn) +@@ -212,6 +272,7 @@ class ZFCPDevice: + % {'devnum': self.devnum, 'wwpn': self.wwpn, + 'fcplun': self.fcplun, 'e': e}) + ++ # remove the LUN + try: + logged_write_line_to_file(unitremove, self.fcplun) + except OSError as e: +@@ -221,6 +282,7 @@ class ZFCPDevice: + % {'fcplun': self.fcplun, 'wwpn': self.wwpn, + 'devnum': self.devnum, 'e': e}) + ++ # remove the WWPN only if there are no other LUNs attached + if os.path.exists(portadd): + # only try to remove ports with older zfcp sysfs interface + for lun in os.listdir(portdir): +@@ -238,6 +300,7 @@ class ZFCPDevice: + % {'wwpn': self.wwpn, + 'devnum': self.devnum, 'e': e}) + ++ # check if there are other WWPNs existing for the zFCP device number + if os.path.exists(portadd): + # older zfcp sysfs interface + for port in os.listdir(devdir): +@@ -256,12 +319,8 @@ class ZFCPDevice: + self.devnum, luns[0]) + return True + +- try: +- logged_write_line_to_file(offline, "0") +- except OSError as e: +- raise ValueError(_("Could not set zFCP device %(devnum)s " +- "offline (%(e)s).") +- % {'devnum': self.devnum, 'e': e}) ++ # no other WWPNs/LUNs exists for this device number, it's safe to bring it offline ++ self._set_zfcp_device_offline() + + return True + +-- +2.34.3 + + +From 2dc44c00f170d64458a7c89abc91cda61af8387f Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Sun, 21 Nov 2021 02:35:05 +0100 +Subject: [PATCH 3/8] Move offline_scsi_device() to the base class + +Related: rhbz#1937030 +--- + blivet/zfcp.py | 74 ++++++++++++++++++++++++++++++-------------------- + 1 file changed, 44 insertions(+), 30 deletions(-) + +diff --git a/blivet/zfcp.py b/blivet/zfcp.py +index 4a50f65f..af8f841d 100644 +--- a/blivet/zfcp.py ++++ b/blivet/zfcp.py +@@ -110,6 +110,15 @@ class ZFCPDeviceBase(ABC): + "offline (%(e)s).") + % {'devnum': self.devnum, 'e': e}) + ++ def _is_scsi_associated_with_fcp(self, fcphbasysfs, _fcpwwpnsysfs, _fcplunsysfs): ++ """Decide if the SCSI device with the provided SCSI attributes ++ corresponds to the zFCP device. ++ ++ :returns: True or False ++ """ ++ ++ return fcphbasysfs == self.devnum ++ + def online_device(self): + """Initialize the device and make its storage block device(s) ready to use. + +@@ -121,6 +130,30 @@ class ZFCPDeviceBase(ABC): + self._set_zfcp_device_online() + return True + ++ def offline_scsi_device(self): ++ """Find SCSI devices associated to the zFCP device and remove them from the system.""" ++ ++ # A list of existing SCSI devices in format Host:Bus:Target:Lun ++ scsi_devices = [f for f in os.listdir(scsidevsysfs) if re.search(r'^[0-9]+:[0-9]+:[0-9]+:[0-9]+$', f)] ++ ++ for scsidev in scsi_devices: ++ fcpsysfs = os.path.join(scsidevsysfs, scsidev) ++ ++ with open(os.path.join(fcpsysfs, "hba_id")) as f: ++ fcphbasysfs = f.readline().strip() ++ with open(os.path.join(fcpsysfs, "wwpn")) as f: ++ fcpwwpnsysfs = f.readline().strip() ++ with open(os.path.join(fcpsysfs, "fcp_lun")) as f: ++ fcplunsysfs = f.readline().strip() ++ ++ if self._is_scsi_associated_with_fcp(fcphbasysfs, fcpwwpnsysfs, fcplunsysfs): ++ scsidel = os.path.join(scsidevsysfs, scsidev, "delete") ++ logged_write_line_to_file(scsidel, "1") ++ udev.settle() ++ return ++ ++ log.warning("No scsi device found to delete for zfcp %s", self) ++ + + class ZFCPDevice(ZFCPDeviceBase): + """A class for zFCP devices that are not configured in NPIV mode. Such +@@ -142,6 +175,17 @@ class ZFCPDevice(ZFCPDeviceBase): + def _to_string(self): + return "{} {} {}".format(self.devnum, self.wwpn, self.fcplun) + ++ def _is_scsi_associated_with_fcp(self, fcphbasysfs, fcpwwpnsysfs, fcplunsysfs): ++ """Decide if the SCSI device with the provided SCSI attributes ++ corresponds to the zFCP device. ++ ++ :returns: True or False ++ """ ++ ++ return (fcphbasysfs == self.devnum and ++ fcpwwpnsysfs == self.wwpn and ++ fcplunsysfs == self.fcplun) ++ + def online_device(self): + """Initialize the device and make its storage block device(s) ready to use. + +@@ -224,36 +268,6 @@ class ZFCPDevice(ZFCPDeviceBase): + + return True + +- def offline_scsi_device(self): +- """Find SCSI devices associated to the zFCP device and remove them from the system.""" +- +- # A list of existing SCSI devices in format Host:Bus:Target:Lun +- scsi_devices = [f for f in os.listdir(scsidevsysfs) if re.search(r'^[0-9]+:[0-9]+:[0-9]+:[0-9]+$', f)] +- +- for scsidev in scsi_devices: +- fcpsysfs = "%s/%s" % (scsidevsysfs, scsidev) +- scsidel = "%s/%s/delete" % (scsidevsysfs, scsidev) +- +- f = open("%s/hba_id" % (fcpsysfs), "r") +- fcphbasysfs = f.readline().strip() +- f.close() +- f = open("%s/wwpn" % (fcpsysfs), "r") +- fcpwwpnsysfs = f.readline().strip() +- f.close() +- f = open("%s/fcp_lun" % (fcpsysfs), "r") +- fcplunsysfs = f.readline().strip() +- f.close() +- +- if fcphbasysfs == self.devnum \ +- and fcpwwpnsysfs == self.wwpn \ +- and fcplunsysfs == self.fcplun: +- logged_write_line_to_file(scsidel, "1") +- udev.settle() +- return +- +- log.warning("no scsi device found to delete for zfcp %s %s %s", +- self.devnum, self.wwpn, self.fcplun) +- + def offline_device(self): + """Remove the zFCP device from the system.""" + +-- +2.34.3 + + +From f194c6e591c3e409f227fd10d3e9923af91ea893 Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Sat, 6 Nov 2021 21:27:52 +0100 +Subject: [PATCH 4/8] Allow to delete more than one SCSI device + +NPIV zFCP devices can attach more than one SCSI device, so allow to +delete them all. For non-NPIV devices it means possible slowdown, since +all SCSI devices would now be checked. + +Related: rhbz#1937030 +--- + blivet/zfcp.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/blivet/zfcp.py b/blivet/zfcp.py +index af8f841d..3b3f623b 100644 +--- a/blivet/zfcp.py ++++ b/blivet/zfcp.py +@@ -136,6 +136,7 @@ class ZFCPDeviceBase(ABC): + # A list of existing SCSI devices in format Host:Bus:Target:Lun + scsi_devices = [f for f in os.listdir(scsidevsysfs) if re.search(r'^[0-9]+:[0-9]+:[0-9]+:[0-9]+$', f)] + ++ scsi_device_found = False + for scsidev in scsi_devices: + fcpsysfs = os.path.join(scsidevsysfs, scsidev) + +@@ -147,12 +148,13 @@ class ZFCPDeviceBase(ABC): + fcplunsysfs = f.readline().strip() + + if self._is_scsi_associated_with_fcp(fcphbasysfs, fcpwwpnsysfs, fcplunsysfs): ++ scsi_device_found = True + scsidel = os.path.join(scsidevsysfs, scsidev, "delete") + logged_write_line_to_file(scsidel, "1") + udev.settle() +- return + +- log.warning("No scsi device found to delete for zfcp %s", self) ++ if not scsi_device_found: ++ log.warning("No scsi device found to delete for zfcp %s", self) + + + class ZFCPDevice(ZFCPDeviceBase): +-- +2.34.3 + + +From f6615be663434079b3f2a86be5db88b816d8a9e1 Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Sun, 21 Nov 2021 03:01:02 +0100 +Subject: [PATCH 5/8] Add a function for reading the value of a kernel module + parameter + +Related: rhbz#1937030 +--- + blivet/util.py | 33 +++++++++++++++++++++++++++++++++ + tests/util_test.py | 11 +++++++++++ + 2 files changed, 44 insertions(+) + +diff --git a/blivet/util.py b/blivet/util.py +index af60210b..cbef65e0 100644 +--- a/blivet/util.py ++++ b/blivet/util.py +@@ -1131,3 +1131,36 @@ def detect_virt(): + return False + else: + return vm[0] in ('qemu', 'kvm', 'xen') ++ ++ ++def natural_sort_key(device): ++ """ Sorting key for devices which makes sure partitions are sorted in natural ++ way, e.g. 'sda1, sda2, ..., sda10' and not like 'sda1, sda10, sda2, ...' ++ """ ++ if device.type == "partition" and device.parted_partition and device.disk: ++ part_num = getattr(device.parted_partition, "number", -1) ++ return [device.disk.name, part_num] ++ else: ++ return [device.name, 0] ++ ++ ++def get_kernel_module_parameter(module, parameter): ++ """ Return the value of a given kernel module parameter ++ ++ :param str module: a kernel module ++ :param str parameter: a module parameter ++ :returns: the value of the given kernel module parameter or None ++ :rtype: str ++ """ ++ ++ value = None ++ ++ parameter_path = os.path.join("/sys/module", module, "parameters", parameter) ++ try: ++ with open(parameter_path) as f: ++ value = f.read().strip() ++ except IOError as e: ++ log.warning("Couldn't get the value of the parameter '%s' from the kernel module '%s': %s", ++ parameter, module, str(e)) ++ ++ return value +diff --git a/tests/util_test.py b/tests/util_test.py +index b4f82c1b..805447c7 100644 +--- a/tests/util_test.py ++++ b/tests/util_test.py +@@ -182,3 +182,14 @@ class GetSysfsAttrTestCase(unittest.TestCase): + # the unicode replacement character (U+FFFD) should be used instead + model = util.get_sysfs_attr(sysfs, "model") + self.assertEqual(model, "test model\ufffd") ++ ++ ++class GetKernelModuleParameterTestCase(unittest.TestCase): ++ ++ def test_nonexisting_kernel_module(self): ++ self.assertIsNone(util.get_kernel_module_parameter("unknown_module", "unknown_parameter")) ++ ++ def test_get_kernel_module_parameter_value(self): ++ with mock.patch('blivet.util.open', mock.mock_open(read_data='value\n')): ++ value = util.get_kernel_module_parameter("module", "parameter") ++ self.assertEqual(value, "value") +-- +2.34.3 + + +From 17c99a2444ef750bdbf5b24665c5fd3c52e687d9 Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Sun, 21 Nov 2021 03:01:46 +0100 +Subject: [PATCH 6/8] LUN and WWPN should not be used for NPIV zFCP devices + +Log a warning if activating a zFCP device in NPIV mode and WWPN or +LUN have been provided. They are superfluous for NPIV devices. + +Related: rhbz#1937030 +--- + blivet/zfcp.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 57 insertions(+), 1 deletion(-) + +diff --git a/blivet/zfcp.py b/blivet/zfcp.py +index 3b3f623b..726e9364 100644 +--- a/blivet/zfcp.py ++++ b/blivet/zfcp.py +@@ -22,6 +22,7 @@ + import os + import re + from abc import ABC ++import glob + from . import udev + from . import util + from .i18n import _ +@@ -47,6 +48,55 @@ zfcpsysfs = "/sys/bus/ccw/drivers/zfcp" + scsidevsysfs = "/sys/bus/scsi/devices" + zfcpconf = "/etc/zfcp.conf" + ++ ++def _is_lun_scan_allowed(): ++ """Return True if automatic LUN scanning is enabled by the kernel.""" ++ ++ allow_lun_scan = util.get_kernel_module_parameter("zfcp", "allow_lun_scan") ++ return allow_lun_scan == "Y" ++ ++ ++def _is_port_in_npiv_mode(device_id): ++ """Return True if the device ID is configured in NPIV mode. See ++ https://www.ibm.com/docs/en/linux-on-systems?topic=devices-use-npiv ++ """ ++ ++ port_in_npiv_mode = False ++ port_type_path = "/sys/bus/ccw/devices/{}/host*/fc_host/host*/port_type".format(device_id) ++ port_type_paths = glob.glob(port_type_path) ++ try: ++ for filename in port_type_paths: ++ with open(filename) as f: ++ port_type = f.read() ++ if re.search(r"(^|\s)NPIV(\s|$)", port_type): ++ port_in_npiv_mode = True ++ except OSError as e: ++ log.warning("Couldn't read the port_type attribute of the %s device: %s", device_id, str(e)) ++ port_in_npiv_mode = False ++ ++ return port_in_npiv_mode ++ ++ ++def is_npiv_enabled(device_id): ++ """Return True if the given zFCP device ID is configured and usable in ++ NPIV (N_Port ID Virtualization) mode. ++ ++ :returns: True or False ++ """ ++ ++ # LUN scanning disabled by the kernel module prevents using the device in NPIV mode ++ if not _is_lun_scan_allowed(): ++ log.warning("Automatic LUN scanning is disabled by the zfcp kernel module.") ++ return False ++ ++ # The port itself has to be configured in NPIV mode ++ if not _is_port_in_npiv_mode(device_id): ++ log.warning("The zFCP device %s is not configured in NPIV mode.", device_id) ++ return False ++ ++ return True ++ ++ + class ZFCPDeviceBase(ABC): + """An abstract base class for zFCP storage devices.""" + +@@ -203,6 +253,13 @@ class ZFCPDevice(ZFCPDeviceBase): + unitdir = "%s/%s" % (portdir, self.fcplun) + failed = "%s/failed" % (unitdir) + ++ # Activating an NPIV enabled device using devnum, WWPN and LUN should still be possible ++ # as this method was used as a workaround until the support for NPIV enabled devices has ++ # been implemented. Just log a warning message and continue. ++ if is_npiv_enabled(self.devnum): ++ log.warning("zFCP device %s in NPIV mode brought online. All LUNs will be activated " ++ "automatically although WWPN and LUN have been provided.", self.devnum) ++ + # create the sysfs directory for the WWPN/port + if not os.path.exists(portdir): + if os.path.exists(portadd): +@@ -327,7 +384,6 @@ class ZFCPDevice(ZFCPDeviceBase): + return True + else: + # newer zfcp sysfs interface with auto port scan +- import glob + luns = glob.glob("%s/0x????????????????/0x????????????????" + % (devdir,)) + if len(luns) != 0: +-- +2.34.3 + + +From a8f97bd0d74e3da9c18bd03d968f5d2f0c3ee46f Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Sat, 6 Nov 2021 21:27:52 +0100 +Subject: [PATCH 7/8] Add new class for NPIV-enabled devices + +Related: rhbz#1937030 +--- + blivet/zfcp.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 50 insertions(+), 3 deletions(-) + +diff --git a/blivet/zfcp.py b/blivet/zfcp.py +index 726e9364..e6c0e48a 100644 +--- a/blivet/zfcp.py ++++ b/blivet/zfcp.py +@@ -397,6 +397,44 @@ class ZFCPDevice(ZFCPDeviceBase): + return True + + ++class ZFCPNPIVDevice(ZFCPDeviceBase): ++ """Class for zFCP devices configured in NPIV mode. Only a zFCP device number is ++ needed for such devices. ++ """ ++ ++ def online_device(self): ++ """Initialize the device and make its storage block device(s) ready to use. ++ ++ :returns: True if success ++ :raises: ValueError if the device cannot be initialized ++ """ ++ ++ super().online_device() ++ ++ if not is_npiv_enabled(self.devnum): ++ raise ValueError(_("zFCP device %s cannot be used in NPIV mode.") % self) ++ ++ return True ++ ++ def offline_device(self): ++ """Remove the zFCP device from the system. ++ ++ :returns: True if success ++ :raises: ValueError if the device cannot be brought offline ++ """ ++ ++ try: ++ self.offline_scsi_device() ++ except OSError as e: ++ raise ValueError(_("Could not correctly delete SCSI device of " ++ "zFCP %(zfcpdev)s (%(e)s).") ++ % {'zfcpdev': self, 'e': e}) ++ ++ self._set_zfcp_device_offline() ++ ++ return True ++ ++ + class zFCP: + + """ ZFCP utility class. +@@ -439,7 +477,12 @@ class zFCP: + + fields = line.split() + +- if len(fields) == 3: ++ # NPIV enabled device ++ if len(fields) == 1: ++ devnum = fields[0] ++ wwpn = None ++ fcplun = None ++ elif len(fields) == 3: + devnum = fields[0] + wwpn = fields[1] + fcplun = fields[2] +@@ -458,8 +501,12 @@ class zFCP: + except ValueError as e: + log.warning("%s", str(e)) + +- def add_fcp(self, devnum, wwpn, fcplun): +- d = ZFCPDevice(devnum, wwpn, fcplun) ++ def add_fcp(self, devnum, wwpn=None, fcplun=None): ++ if wwpn and fcplun: ++ d = ZFCPDevice(devnum, wwpn, fcplun) ++ else: ++ d = ZFCPNPIVDevice(devnum) ++ + if d.online_device(): + self.fcpdevs.add(d) + +-- +2.34.3 + + +From 963822ff989c938e74d582216f4f7ded595eccc1 Mon Sep 17 00:00:00 2001 +From: Jan Stodola +Date: Sat, 20 Nov 2021 23:12:43 +0100 +Subject: [PATCH 8/8] Generate correct dracut boot arguments for NPIV devices + +NPIV enabled devices need only the device ID. WWPNs/LUNs are discovered +automatically by the kernel module. + +Resolves: rhbz#1937030 +--- + blivet/devices/disk.py | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/blivet/devices/disk.py b/blivet/devices/disk.py +index 67a01ba6..36278507 100644 +--- a/blivet/devices/disk.py ++++ b/blivet/devices/disk.py +@@ -577,7 +577,15 @@ class ZFCPDiskDevice(DiskDevice): + 'lun': self.fcp_lun} + + def dracut_setup_args(self): +- return set(["rd.zfcp=%s,%s,%s" % (self.hba_id, self.wwpn, self.fcp_lun,)]) ++ from ..zfcp import is_npiv_enabled ++ ++ # zFCP devices in NPIV mode need only the device ID ++ if is_npiv_enabled(self.hba_id): ++ dracut_args = set(["rd.zfcp=%s" % self.hba_id]) ++ else: ++ dracut_args = set(["rd.zfcp=%s,%s,%s" % (self.hba_id, self.wwpn, self.fcp_lun,)]) ++ ++ return dracut_args + + + class DASDDevice(DiskDevice): +-- +2.34.3 + diff --git a/SOURCES/0026-Add-a-very-simple-NVMe-module.patch b/SOURCES/0026-Add-a-very-simple-NVMe-module.patch new file mode 100644 index 0000000..6a25884 --- /dev/null +++ b/SOURCES/0026-Add-a-very-simple-NVMe-module.patch @@ -0,0 +1,129 @@ +From 5d54b2ede698d5084aa6c780295fcc9aafbfa357 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Mon, 9 May 2022 13:38:50 +0200 +Subject: [PATCH] Add a very simple NVMe module + +This covers only the basic functionallity needed by Anaconda right +now: populating the config files in /etc/nvme and copying them to +the installed system. The API for the NVMe singleton is based on +the similar modules for iSCSI and FCoE. + +Resolves: rhbz#2073008 +--- + blivet/errors.py | 14 +++++++++ + blivet/nvme.py | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 95 insertions(+) + create mode 100644 blivet/nvme.py + +diff --git a/blivet/errors.py b/blivet/errors.py +index fd51283f..b16cf2c5 100644 +--- a/blivet/errors.py ++++ b/blivet/errors.py +@@ -307,3 +307,17 @@ class EventHandlingError(StorageError): + + class ThreadError(StorageError): + """ An error occurred in a non-main thread. """ ++ ++# other ++ ++ ++class FCoEError(StorageError, OSError): ++ pass ++ ++ ++class ISCSIError(StorageError, OSError): ++ pass ++ ++ ++class NVMeError(StorageError, OSError): ++ pass +diff --git a/blivet/nvme.py b/blivet/nvme.py +new file mode 100644 +index 00000000..17bead15 +--- /dev/null ++++ b/blivet/nvme.py +@@ -0,0 +1,81 @@ ++# ++# nvme.py - NVMe class ++# ++# Copyright (C) 2022 Red Hat, Inc. All rights reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++# ++ ++import os ++import shutil ++ ++from . import errors ++from . import util ++ ++import logging ++log = logging.getLogger("blivet") ++ ++HOSTNQN_FILE = "/etc/nvme/hostnqn" ++HOSTID_FILE = "/etc/nvme/hostid" ++ ++ ++class NVMe(object): ++ """ NVMe utility class. ++ ++ .. warning:: ++ Since this is a singleton class, calling deepcopy() on the instance ++ just returns ``self`` with no copy being created. ++ """ ++ ++ def __init__(self): ++ self.started = False ++ ++ # So that users can write nvme() to get the singleton instance ++ def __call__(self): ++ return self ++ ++ def __deepcopy__(self, memo_dict): # pylint: disable=unused-argument ++ return self ++ ++ def startup(self): ++ if self.started: ++ return ++ ++ rc, nqn = util.run_program_and_capture_output(["nvme", "gen-hostnqn"]) ++ if rc != 0: ++ raise errors.NVMeError("Failed to generate hostnqn") ++ ++ with open(HOSTNQN_FILE, "w") as f: ++ f.write(nqn) ++ ++ rc, hid = util.run_program_and_capture_output(["dmidecode", "-s", "system-uuid"]) ++ if rc != 0: ++ raise errors.NVMeError("Failed to generate host ID") ++ ++ with open(HOSTID_FILE, "w") as f: ++ f.write(hid) ++ ++ self.started = True ++ ++ def write(self, root): # pylint: disable=unused-argument ++ # copy the hostnqn and hostid files ++ if not os.path.isdir(root + "/etc/nvme"): ++ os.makedirs(root + "/etc/nvme", 0o755) ++ shutil.copyfile(HOSTNQN_FILE, root + HOSTNQN_FILE) ++ shutil.copyfile(HOSTID_FILE, root + HOSTID_FILE) ++ ++ ++# Create nvme singleton ++nvme = NVMe() ++""" An instance of :class:`NVMe` """ +-- +2.34.3 + diff --git a/SOURCES/0027-DDF-RAID-support-using-mdadm.patch b/SOURCES/0027-DDF-RAID-support-using-mdadm.patch new file mode 100644 index 0000000..80709fe --- /dev/null +++ b/SOURCES/0027-DDF-RAID-support-using-mdadm.patch @@ -0,0 +1,107 @@ +From 3a64795bdb94f525b55375bd89e7e5c8bc3a8921 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 17 Aug 2022 14:24:21 +0200 +Subject: [PATCH 1/3] 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 2ba9dcfe5..ce15905dc 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 41ddef810..4aa3f3b07 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 + +From 3ea946fa7ae18dbc413c17f1cd5a6eb23aaf1ea8 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 17 Aug 2022 14:24:58 +0200 +Subject: [PATCH 2/3] 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 3479e3f78..a7602d209 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): + +From 4e766bb6f2bb487003ed4fa9b8415760c436af81 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 17 Mar 2022 15:48:25 +0100 +Subject: [PATCH 3/3] Do not crash when a disk populator doesn't return kwargs + +This happens when trying to use Blivet on a system with a BIOS +RAID without dmraid installed. Because we don't fully support +BIOS RAIDs using MD the MDBiosRaidDevicePopulator helper fails +to get kwargs for the BIOS RAID "disk" and populate fails. +--- + blivet/populator/helpers/disk.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/blivet/populator/helpers/disk.py b/blivet/populator/helpers/disk.py +index 2e5026f7e..9db7b810d 100644 +--- a/blivet/populator/helpers/disk.py ++++ b/blivet/populator/helpers/disk.py +@@ -68,6 +68,8 @@ def run(self): + log_method_call(self, name=name) + + kwargs = self._get_kwargs() ++ if not kwargs: ++ return + device = self._device_class(name, **kwargs) + self._devicetree._add_device(device) + return device diff --git a/SPECS/python-blivet.spec b/SPECS/python-blivet.spec index 1f4198a..c533539 100644 --- a/SPECS/python-blivet.spec +++ b/SPECS/python-blivet.spec @@ -23,7 +23,7 @@ Version: 3.4.0 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 13%{?prerelease}%{?dist} +Release: 16%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ %global realname blivet @@ -46,7 +46,16 @@ Patch12: 0014-LVM-devices-file-support.patch Patch13: 0015-iscsi-Replace-all-log_exception_info-calls-with-log.patch Patch14: 0016-Fix-log-message-for-the-LVM-devices-filter.patch Patch15: 0017-Exclude-unusable-disks-from-PartitionFactory.patch -Patch16: 0018-PO-update.patch +Patch16: 0018-Fix-getting-PV-info-in-LVMPhysicalVolume-from-the-ca.patch +Patch17: 0019-Do-not-crash-when-changing-disklabel-on-disks-with-a.patch +Patch18: 0020-ActionDestroyDevice-should-not-obsolete-ActionRemove.patch +Patch19: 0021-Correctly-set-vg_name-after-adding-removing-a-PV-fro.patch +Patch20: 0022-Add-support-for-creating-LVM-cache-pools.patch +Patch21: 0023-Use-LVM-PV-format-current_size-in-LVMVolumeGroupDevi.patch +Patch22: 0024-tests-Mark-fake-disks-in-test_get_related_disks-as-n.patch +Patch23: 0025-Add-support-for-NPIV-enabled-zFCP-devices.patch +Patch24: 0026-Add-a-very-simple-NVMe-module.patch +Patch25: 0027-DDF-RAID-support-using-mdadm.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -209,9 +218,37 @@ configuration. %endif %changelog -* Mon Mar 07 2022 Vojtech Trefny - 3.4.0-13 -- RHEL 9.0 GA Localization - Resolves: rhbz#2017378 +* Thu Aug 18 2022 Vojtech Trefny - 3.4.0-16 +- DDF RAID support using mdadm + Resolves: rhbz#2109030 + +* Mon Jun 20 2022 Jan Pokorny - 3.4.0-15 +- Add a very simple NVMe module + Resolves: rhbz#2073008 +- Add support for NPIV-enabled zFCP devices + Resolves: rhbz#1937030 +- Fix removing zFCP SCSI devices + Related: rhbz#1937030 +- tests: Mark "fake" disks in test_get_related_disks as non-existing + Resolves: rhbz#2062690 + +* Thu Jun 02 2022 Jan Pokorny - 3.4.0-14 +- Release version increase to fix RHEL upgrade path + Related: rhbz#2081278 + +* Thu Jun 02 2022 Jan Pokorny - 3.4.0-13 +- Fix getting PV info in LVMPhysicalVolume from the cache + Resolves: rhbz#2079221 +- Do not crash when changing disklabel on disks with active devices + Resolves: rhbz#2078803 +- ActionDestroyDevice should not obsolete ActionRemoveMember + Resolves: rhbz#2076956 +- Correctly set vg_name after adding/removing a PV from a VG + Resolves: rhbz#2081278 +- Add support for creating LVM cache pools + Resolves: rhbz#2055200 +- Use LVM PV format current_size in LVMVolumeGroupDevice._remove + Related: rhbz#2081278 * Tue Feb 01 2022 Vojtech Trefny - 3.4.0-12 - Fix log message for the LVM devices filter