curtin-dev team mailing list archive
-
curtin-dev team
-
Mailing list archive
-
Message #01482
Re: [Merge] ~mwhudson/curtin:lp-1868177 into curtin:master
I think this is fine. I _was_ thinking to only remove the strict=True default in _wipe_superblock in clear-holders. However no where else is code calling with strict=true; if *something* external were using wipe_superblock and strict=true, so this is the minimal change I think:
(here's me wanting github style markdown in comments)
```
(crispyboi) curtin % git diff
diff --git a/curtin/block/clear_holders.py b/curtin/block/clear_holders.py
index c182d91a..ba026574 100644
--- a/curtin/block/clear_holders.py
+++ b/curtin/block/clear_holders.py
@@ -332,7 +332,7 @@ def wipe_superblock(device):
time.sleep(wait)
-def _wipe_superblock(blockdev, exclusive=True, strict=True):
+def _wipe_superblock(blockdev, exclusive=True):
""" No checks, just call wipe_volume """
retries = [1, 3, 5, 7]
@@ -341,8 +341,7 @@ def _wipe_superblock(blockdev, exclusive=True, strict=True):
LOG.debug('wiping %s attempt %s/%s',
blockdev, attempt + 1, len(retries))
try:
- block.wipe_volume(blockdev, mode='superblock',
- exclusive=exclusive, strict=strict)
+ block.wipe_volume(blockdev, mode='superblock', exclusive=exclusive)
LOG.debug('successfully wiped device %s on attempt %s/%s',
blockdev, attempt + 1, len(retries))
return
```
So, I'll approve and leave it up to you if you want to do the minimal or the full removal that you have.
--
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/399893
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:lp-1868177 into curtin:master.
References