curtin-dev team mailing list archive

[Michael Hudson-Doyle <mwhudsonlp@xxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:disk_handler-empty-vtoc into curtin:master.

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/394153
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:disk_handler-empty-vtoc into curtin:master.

diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
index eada650..874ccbb 100644
--- a/curtin/commands/block_meta.py
+++ b/curtin/commands/block_meta.py
@@ -611,8 +611,7 @@ def disk_handler(info, storage_config):
             elif ptable in _dos_names:
                 util.subp(["parted", disk, "--script", "mklabel", "msdos"])
             elif ptable == "vtoc":
-                # ignore dasd partition tables
-                pass
+                util.subp(["fdasd", "-c", "/dev/null", disk])
         holders = clear_holders.get_holders(disk)
         if len(holders) > 0:
             LOG.info('Detected block holders on disk %s: %s', disk, holders)
diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index 98be573..ffec434 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -1294,6 +1294,17 @@ class TestDiskHandler(CiTestCase):
         m_getpath.assert_called_with(info['id'], storage_config)
         m_block.get_part_table_type.assert_called_with(disk_path)
 
+    @patch('curtin.commands.block_meta.util.subp')
+    @patch('curtin.commands.block_meta.clear_holders.get_holders')
+    @patch('curtin.commands.block_meta.get_path_to_storage_volume')
+    def test_disk_handler_calls_fdasd_for_vtoc(self, m_getpath,
+                                               m_get_holders, m_subp):
+        info = {'ptable': 'vtoc', 'type': 'disk', 'id': 'disk-foobar'}
+        path = m_getpath.return_value = self.random_string()
+        m_get_holders.return_value = []
+        block_meta.disk_handler(info, OrderedDict())
+        m_subp.assert_called_once_with(['fdasd', '-c', '/dev/null', path])
+
 
 class TestLvmVolgroupHandler(CiTestCase):