From 462099a9137fb7997140360c07665a21615a0fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
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):