curtin-dev team mailing list archive

[Michael Hudson-Doyle <mwhudsonlp@xxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:dasd-partition-reuse into curtin:master.

Commit message:
block_meta: fix wiping of existing dasd partition

The partition verification code does not need the part_path variable in
this case but the partition wiping code does.


Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/401068
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:dasd-partition-reuse into curtin:master.

diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
index cf6bc02..201c3bd 100644
--- a/curtin/commands/block_meta.py
+++ b/curtin/commands/block_meta.py
@@ -881,11 +881,11 @@ def partition_handler(info, storage_config):
     # Handle preserve flag
     create_partition = True
     if config.value_as_boolean(info.get('preserve')):
+        part_path = block.dev_path(
+            block.partition_kname(disk_kname, partnumber))
         if disk_ptable == 'vtoc':
             partition_verify_fdasd(disk, partnumber, info)
         else:
-            part_path = block.dev_path(
-                block.partition_kname(disk_kname, partnumber))
             partition_verify_sfdisk(part_path, info)
         LOG.debug(
             '%s partition %s already present, skipping create',