From 8c06296ab67321b0db9668cfbee4936980556c89 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 28 2020 19:22:12 +0000 Subject: import python-blivet-3.2.2-5.el8 --- diff --git a/SOURCES/0006-Blivet-RHEL-8.3-localization-update.patch b/SOURCES/0006-Blivet-RHEL-8.3-localization-update.patch new file mode 100644 index 0000000..ad1368b --- /dev/null +++ b/SOURCES/0006-Blivet-RHEL-8.3-localization-update.patch @@ -0,0 +1,438 @@ +From 44d7e9669fe55fd4b2b3a6c96f23e2d0669f8dbb Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 9 Jul 2020 13:42:31 +0200 +Subject: [PATCH] Blivet RHEL 8.3 localization update + +Resolves: rhbz#1820565 +--- + po/ja.po | 33 ++++++++++----------- + po/ko.po | 83 ++++++++++++++++++++++++----------------------------- + po/zh_CN.po | 28 +++++++++--------- + 3 files changed, 68 insertions(+), 76 deletions(-) + +diff --git a/po/ja.po b/po/ja.po +index 733e63a0..b4c864c2 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -29,17 +29,17 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2020-05-21 12:42+0200\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" ++"POT-Creation-Date: 2020-01-29 14:04+0100\n" ++"PO-Revision-Date: 2020-07-03 07:42+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.1.1\n" + + #: ../blivet/errors.py:210 + msgid "" +@@ -47,6 +47,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値が重複することが原因です。その場合は、いずれかのデバイスを切断するか、再フォーマッ" ++"トしてください。" + + #: ../blivet/errors.py:217 + msgid "" +@@ -54,9 +56,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 "" +-"なんらかの理由により、kernel がパーティションを報告しているディスク上でディス" +-"クラベルを見つけられませんでした。何が問題となっているかは不明です。バグを " +-"http://bugzilla.redhat.com に提出してください。" ++"なんらかの理由により、kernel がパーティションを報告しているディスク上でディスクラベルを見つけられませんでした。何が問題となっているかは不明です。" ++"バグを http://bugzilla.redhat.com に提出してください" + + #: ../blivet/errors.py:224 + msgid "" +@@ -84,7 +85,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 +203,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 +258,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 +266,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 +@@ -368,15 +369,15 @@ msgstr "" + msgid "Cannot remove a member from existing %s array" + msgstr "既存の %s 配列からメンバーを削除できません" + +-#: ../blivet/formats/fs.py:934 ++#: ../blivet/formats/fs.py:932 + msgid "EFI System Partition" + msgstr "EFI システムパーティション" + +-#: ../blivet/formats/fs.py:1139 ++#: ../blivet/formats/fs.py:1137 + msgid "Apple Bootstrap" + msgstr "Apple ブートストラップ" + +-#: ../blivet/formats/fs.py:1175 ++#: ../blivet/formats/fs.py:1173 + msgid "Linux HFS+ ESP" + msgstr "Linux HFS+ ESP" + +diff --git a/po/ko.po b/po/ko.po +index 66789af0..747b00c5 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -20,17 +20,17 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2020-05-21 12:42+0200\n" +-"PO-Revision-Date: 2018-09-21 01:08+0000\n" +-"Last-Translator: Copied by Zanata \n" +-"Language-Team: Korean (http://www.transifex.com/projects/p/blivet/language/" +-"ko/)\n" ++"POT-Creation-Date: 2020-01-29 14:04+0100\n" ++"PO-Revision-Date: 2020-07-03 07:42+0000\n" ++"Last-Translator: Ludek Janda \n" ++"Language-Team: Korean \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: Zanata 4.6.2\n" ++"X-Generator: Weblate 4.1.1\n" + + #: ../blivet/errors.py:210 + msgid "" +@@ -38,6 +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 값이 복제되기 때문에 발생합니다. 이 경우 장치 중 하나를 분리하거나 다시 " ++"포맷할 수 있습니다." + + #: ../blivet/errors.py:217 + msgid "" +@@ -45,9 +47,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" +-"에 버그 리포트를 제출해 주십시오." ++"일부 이유로 커널이 파티션 설정을 보고하는 디스크에 디스크 레이블을 배치할 수 없습니다. 정확한 문제가 무엇인지 알 수 없습니다. " ++"http://bugzilla.redhat.com에 버그 리포트를 제출해 주십시오" + + #: ../blivet/errors.py:224 + msgid "" +@@ -78,11 +79,11 @@ msgstr "장치 번호를 지정하지 않았거나, 번호가 맞지 않습니 + + #: ../blivet/zfcp.py:64 + msgid "You have not specified a worldwide port name or the name is invalid." +-msgstr "세계 포트 이름(WWPN)을 지정하지 않았거나, 포트 번호가 맞지 않습니다" ++msgstr "세계 포트 이름(WWPN)을 지정하지 않았거나, 포트 번호가 맞지 않습니다." + + #: ../blivet/zfcp.py:66 + msgid "You have not specified a FCP LUN or the number is invalid." +-msgstr "FCP LUN을 지정하지 않았거나, 번호가 맞지 않습니다" ++msgstr "FCP LUN을 지정하지 않았거나, 번호가 맞지 않습니다." + + #: ../blivet/zfcp.py:91 + #, python-format +@@ -103,7 +104,7 @@ msgstr "WWPN %(wwpn)s을(를) zFCP 장치 %(devnum)s (%(e)s)에 추가할 수 + #: ../blivet/zfcp.py:119 + #, python-format + msgid "WWPN %(wwpn)s not found at zFCP device %(devnum)s." +-msgstr "WWPN %(wwpn)s을(를) zFCP 장치 %(devnum)s에서 찾을 수 없습니다. " ++msgstr "WWPN %(wwpn)s을(를) zFCP 장치 %(devnum)s에서 찾을 수 없습니다." + + #: ../blivet/zfcp.py:134 + #, python-format +@@ -111,8 +112,7 @@ msgid "" + "Could not add LUN %(fcplun)s to WWPN %(wwpn)s on zFCP device %(devnum)s " + "(%(e)s)." + msgstr "" +-"zFCP 장치 %(devnum)s (%(e)s)에서 LUN %(fcplun)s을(를) WWPN %(wwpn)s에 추가할 " +-"수 없습니다. " ++"zFCP 장치 %(devnum)s (%(e)s)에서 LUN %(fcplun)s을(를) WWPN %(wwpn)s에 추가할 수 없습니다." + + #: ../blivet/zfcp.py:140 + #, python-format +@@ -136,18 +136,14 @@ msgstr "" + msgid "" + "Failed LUN %(fcplun)s at WWPN %(wwpn)s on zFCP device %(devnum)s removed " + "again." +-msgstr "" +-"zFCP 장치 %(devnum)s에 있는 WWPN %(wwpn)s에서 실패한 LUN %(fcplun)s이 다시 삭" +-"제되었습니다. " ++msgstr "zFCP 장치 %(devnum)s에 있는 WWPN %(wwpn)s에서 실패한 LUN %(fcplun)s이 다시 삭제되었습니다." + + #: ../blivet/zfcp.py:218 + #, python-format + msgid "" + "Could not correctly delete SCSI device of zFCP %(devnum)s %(wwpn)s " + "%(fcplun)s (%(e)s)." +-msgstr "" +-"zFCP %(devnum)s %(wwpn)s %(fcplun)s (%(e)s)의 SCSI 장치를 올바르게 삭제할 수 " +-"없습니다. " ++msgstr "zFCP %(devnum)s %(wwpn)s %(fcplun)s (%(e)s)의 SCSI 장치를 올바르게 삭제할 수 없습니다." + + #: ../blivet/zfcp.py:227 + #, python-format +@@ -161,41 +157,40 @@ msgstr "" + #: ../blivet/zfcp.py:245 + #, python-format + msgid "Could not remove WWPN %(wwpn)s on zFCP device %(devnum)s (%(e)s)." +-msgstr "" +-"zFCP 장치 %(devnum)s (%(e)s)에서 WWPN %(wwpn)s을(를) 제거할 수 없습니다. " ++msgstr "zFCP 장치 %(devnum)s (%(e)s)에서 WWPN %(wwpn)s을(를) 제거할 수 없습니다." + + #: ../blivet/zfcp.py:271 + #, python-format + msgid "Could not set zFCP device %(devnum)s offline (%(e)s)." +-msgstr "zFCP 장치 %(devnum)s를 오프라인 (%(e)s)으로 설정할 수 없습니다. " ++msgstr "zFCP 장치 %(devnum)s를 오프라인 (%(e)s)으로 설정할 수 없습니다." + + #: ../blivet/iscsi.py:217 + msgid "Unable to change iSCSI initiator name once set" +-msgstr "iSCSI 개시자 이름이 설정되면 이를 변경할 수 없음 " ++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" +-msgstr "iSCSI 사용 불가능 " ++msgstr "iSCSI 사용 불가능" + + #: ../blivet/iscsi.py:412 + msgid "No initiator name set" +-msgstr "이니셰이터 이름이 설정되지 않음 " ++msgstr "이니셰이터 이름이 설정되지 않음" + + #: ../blivet/iscsi.py:530 + msgid "No iSCSI nodes discovered" +-msgstr "iSCSI 노드를 찾을 수 없음 " ++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" +-msgstr "검색된 노드로 로그인할 수 없음 " ++msgstr "검색된 노드로 로그인할 수 없음" + + #: ../blivet/partitioning.py:454 + msgid "unable to allocate aligned partition" +@@ -265,7 +260,7 @@ msgstr "LVM 요청에 필요한 공간이 충분하지 않습니다" + #: ../blivet/deviceaction.py:194 + #, python-format + msgid "Executing %(action)s" +-msgstr "%(action)s 실행 " ++msgstr "%(action)s 실행" + + #: ../blivet/deviceaction.py:322 + msgid "create device" +@@ -286,7 +281,7 @@ msgstr "포맷 생성" + #: ../blivet/deviceaction.py:613 + #, python-format + msgid "Creating %(type)s on %(device)s" +-msgstr "%(device)s에 %(type)s 생성 " ++msgstr "%(device)s에 %(type)s 생성" + + #: ../blivet/deviceaction.py:640 + #, python-format +@@ -327,11 +322,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 +@@ -341,32 +336,28 @@ msgid "" + 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개의 장치 구성원이 필요합니" +-"다. " ++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 "RAID 레벨 %(raid_level)s이/가 유효한 값이 아닙니다. (%(levels)s) 중 하나여야 합니다." + + #: ../blivet/devices/raid.py:104 + #, python-format + msgid "Cannot remove a member from existing %s array" +-msgstr "기존 %s 어레이에서 장치 구성원을 제거할 수 없습니다 " ++msgstr "기존 %s 어레이에서 장치 구성원을 제거할 수 없습니다" + +-#: ../blivet/formats/fs.py:934 ++#: ../blivet/formats/fs.py:932 + msgid "EFI System Partition" +-msgstr "EFI 시스템 파티션 " ++msgstr "EFI 시스템 파티션" + +-#: ../blivet/formats/fs.py:1139 ++#: ../blivet/formats/fs.py:1137 + msgid "Apple Bootstrap" + msgstr "Apple 부트스트랩" + +-#: ../blivet/formats/fs.py:1175 ++#: ../blivet/formats/fs.py:1173 + msgid "Linux HFS+ ESP" + msgstr "Linux HFS+ ESP" + +@@ -384,7 +375,7 @@ msgstr "암호화됨" + + #: ../blivet/formats/luks.py:388 + msgid "DM Integrity" +-msgstr "DM 무결성 " ++msgstr "DM 무결성" + + #: ../blivet/formats/__init__.py:148 + msgid "Unknown" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 480801de..2be6d492 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -20,24 +20,24 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2020-05-21 12:42+0200\n" +-"PO-Revision-Date: 2018-09-13 02:13+0000\n" +-"Last-Translator: Copied by Zanata \n" +-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/blivet/" +-"language/zh_CN/)\n" ++"POT-Creation-Date: 2020-01-29 14:04+0100\n" ++"PO-Revision-Date: 2020-07-03 07:42+0000\n" ++"Last-Translator: Ludek Janda \n" ++"Language-Team: Chinese (Simplified) \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: Zanata 4.6.2\n" ++"X-Generator: Weblate 4.1.1\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." +-msgstr "" ++msgstr "这通常是由于克隆设备镜像导致 UUID 值重复造成的，而 UUID 值应该是唯一的。如果是这种情况，可以断开其中一个设备或重新格式化它。" + + #: ../blivet/errors.py:217 + msgid "" +@@ -45,8 +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 "" +@@ -170,7 +170,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" +@@ -223,7 +223,7 @@ msgstr "" + + #: ../blivet/partitioning.py:962 + msgid "Unable to allocate requested partition scheme." +-msgstr "无法分配所需分区方案" ++msgstr "无法分配所需分区方案。" + + #: ../blivet/partitioning.py:997 + msgid "not enough free space after creating extended partition" +@@ -347,15 +347,15 @@ msgstr "" + msgid "Cannot remove a member from existing %s array" + msgstr "无法从存在的 %s 阵列中删除一个成员" + +-#: ../blivet/formats/fs.py:934 ++#: ../blivet/formats/fs.py:932 + msgid "EFI System Partition" + msgstr "EFI 系统分区" + +-#: ../blivet/formats/fs.py:1139 ++#: ../blivet/formats/fs.py:1137 + msgid "Apple Bootstrap" + msgstr "Apple Bootstrap" + +-#: ../blivet/formats/fs.py:1175 ++#: ../blivet/formats/fs.py:1173 + msgid "Linux HFS+ ESP" + msgstr "Linux HFS+ ESP" + +-- +2.25.4 + diff --git a/SOURCES/0007-Do-not-use-FSAVAIL-and-FSUSE-options-when-running-lsblk.patch b/SOURCES/0007-Do-not-use-FSAVAIL-and-FSUSE-options-when-running-lsblk.patch new file mode 100644 index 0000000..c8e1447 --- /dev/null +++ b/SOURCES/0007-Do-not-use-FSAVAIL-and-FSUSE-options-when-running-lsblk.patch @@ -0,0 +1,24 @@ +From 7bc4e324580656585adad0cbe51d60ed3540b766 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Fri, 3 Jul 2020 13:04:23 +0200 +Subject: [PATCH] Do not use FSAVAIL and FSUSE% options when running lsblk + +These options were added in util-linux 2.33 which is not available +on older systems so we should not use these. +--- + blivet/blivet.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/blivet.py b/blivet/blivet.py +index fcc2080b..e7dbd37b 100644 +--- a/blivet/blivet.py ++++ b/blivet/blivet.py +@@ -77,7 +77,7 @@ def __init__(self): + self._dump_file = "%s/storage.state" % tempfile.gettempdir() + + try: +- options = "NAME,SIZE,OWNER,GROUP,MODE,FSTYPE,LABEL,UUID,PARTUUID,FSAVAIL,FSUSE%,MOUNTPOINT" ++ options = "NAME,SIZE,OWNER,GROUP,MODE,FSTYPE,LABEL,UUID,PARTUUID,MOUNTPOINT" + out = capture_output(["lsblk", "--bytes", "-a", "-o", options]) + except Exception: # pylint: disable=broad-except + pass diff --git a/SOURCES/0008-set-allowed-disk-labels-for-s390x-as-standard-ones-plus-dasd.patch b/SOURCES/0008-set-allowed-disk-labels-for-s390x-as-standard-ones-plus-dasd.patch new file mode 100644 index 0000000..931fca0 --- /dev/null +++ b/SOURCES/0008-set-allowed-disk-labels-for-s390x-as-standard-ones-plus-dasd.patch @@ -0,0 +1,39 @@ +From 462099a9137fb7997140360c07665a21615a0fea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Tue, 7 Jul 2020 13:19:02 +0200 +Subject: [PATCH] set allowed disk labels for s390x as standard ones (msdos + + gpt) plus dasd + +This will solve issues when a SCSI or NVMe disk with GPT partition table +is used with a s390x machine (rhbz#1827066, rhbz#1854110). +--- + blivet/formats/disklabel.py | 2 +- + tests/formats_test/disklabel_test.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py +index 3dcac12b..53e2c010 100644 +--- a/blivet/formats/disklabel.py ++++ b/blivet/formats/disklabel.py +@@ -230,7 +230,7 @@ def get_platform_label_types(cls): + elif arch.is_efi() and not arch.is_aarch64(): + label_types = ["gpt", "msdos"] + elif arch.is_s390(): +- label_types = ["msdos", "dasd"] ++ label_types += ["dasd"] + + return label_types + +diff --git a/tests/formats_test/disklabel_test.py b/tests/formats_test/disklabel_test.py +index 94f3775f..3068dc07 100644 +--- a/tests/formats_test/disklabel_test.py ++++ b/tests/formats_test/disklabel_test.py +@@ -95,7 +95,7 @@ def test_platform_label_types(self, arch): + arch.is_arm.return_value = False + + arch.is_s390.return_value = True +- self.assertEqual(disklabel_class.get_platform_label_types(), ["msdos", "dasd"]) ++ self.assertEqual(disklabel_class.get_platform_label_types(), ["msdos", "gpt", "dasd"]) + arch.is_s390.return_value = False + + def test_label_type_size_check(self): diff --git a/SOURCES/0009-Do-not-use-BlockDev-utils_have_kernel_module-to-check-for-modules.patch b/SOURCES/0009-Do-not-use-BlockDev-utils_have_kernel_module-to-check-for-modules.patch new file mode 100644 index 0000000..8736460 --- /dev/null +++ b/SOURCES/0009-Do-not-use-BlockDev-utils_have_kernel_module-to-check-for-modules.patch @@ -0,0 +1,47 @@ +From 7303f4a3f2fe3280339f6303dcff31b6ade12176 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 9 Jul 2020 16:30:55 +0200 +Subject: [PATCH] Do not use BlockDev.utils_have_kernel_module to check for + modules + +The function unfortunately uses only the name when searching for +the module and we need to use aliases for modules like ext2 and +ext3. So we need to use "modprobe --dry-run" instead. +--- + blivet/formats/fs.py | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py +index eee15aaa..bcfbc08e 100644 +--- a/blivet/formats/fs.py ++++ b/blivet/formats/fs.py +@@ -60,12 +60,6 @@ + import logging + log = logging.getLogger("blivet") + +-import gi +-gi.require_version("GLib", "2.0") +-gi.require_version("BlockDev", "2.0") +- +-from gi.repository import GLib +-from gi.repository import BlockDev + + AVAILABLE_FILESYSTEMS = kernel_filesystems + +@@ -462,13 +456,13 @@ def check_module(self): + + for module in self._modules: + try: +- succ = BlockDev.utils_have_kernel_module(module) +- except GLib.GError as e: ++ rc = util.run_program(["modprobe", "--dry-run", module]) ++ except OSError as e: + log.error("Could not check kernel module availability %s: %s", module, e) + self._supported = False + return + +- if not succ: ++ if rc: + log.debug("Kernel module %s not available", module) + self._supported = False + return diff --git a/SPECS/python-blivet.spec b/SPECS/python-blivet.spec index 80b222c..272d5c6 100644 --- a/SPECS/python-blivet.spec +++ b/SPECS/python-blivet.spec @@ -23,7 +23,7 @@ Version: 3.2.2 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 3%{?prerelease}%{?dist} +Release: 5%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -36,6 +36,10 @@ Patch1: 0002-remove-btrfs-plugin.patch Patch2: 0003-Skip-test_mounting-for-filesystems-that-are-not-moun.patch Patch3: 0004-Add-extra-sleep-after-pvremove-call.patch Patch4: 0005-Round-down-to-nearest-MiB-value-when-writing-ks-parittion-info.ks +Patch5: 0006-Blivet-RHEL-8.3-localization-update.patch +Patch6: 0007-Do-not-use-FSAVAIL-and-FSUSE-options-when-running-lsblk.patch +Patch7: 0008-set-allowed-disk-labels-for-s390x-as-standard-ones-plus-dasd.patch +Patch8: 0009-Do-not-use-BlockDev-utils_have_kernel_module-to-check-for-modules.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -197,6 +201,18 @@ configuration. %endif %changelog +* Thu Jul 16 2020 Vojtech Trefny - 3.2.2-5 +- set allowed disk labels for s390x as standard ones (msdos + gpt) plus dasd + Resolves: rhbz#1855200 +- Do not use BlockDev.utils_have_kernel_module to check for modules + Resolves: rhbz#1855344 + +* Thu Jul 09 2020 Vojtech Trefny - 3.2.2-4 +- Blivet RHEL 8.3 localization update + Resolves: rhbz#182056 +- Do not use FSAVAIL and FSUSE% options when running lsblk + Resolves: rhbz#1853624 + * Tue Jun 30 2020 Vojtech Trefny - 3.2.2-3 - Round down to nearest MiB value when writing ks parittion info Resolves: rhbz#1850670