Merge branch 'fix-secure-discard' into 'main'

fix: if secure blkdiscard fails, try insecure

See merge request larswirzenius/v-i!51

1 files changed, 8 insertions, 2 deletions

diff --git a/v-i b/v-i
index 3b17fa7..7605bc0 100755
--- a/v-i
+++ b/v-i
@@ -131,11 +131,17 @@ def clean_up_disks(drives):
 
     for drive in drives:
         log(f"blkdiscard {drive}")
-        run(
+        p = run(
             ["blkdiscard", "--force", "--secure", drive],
-            check=True,
             capture_output=True,
         )
+        if p.returncode != 0:
+            log("secure blkdiscard failed, trying insecure")
+            run(
+                ["blkdiscard", "--force", drive],
+                check=True,
+                capture_output=True,
+            )
 
 
 def mklabel(device):