diff --git a/disk-deactivate/disk-deactivate.jq b/disk-deactivate/disk-deactivate.jq index b7c502d..cf6e943 100644 --- a/disk-deactivate/disk-deactivate.jq +++ b/disk-deactivate/disk-deactivate.jq @@ -1,7 +1,7 @@ # since lsblk lacks zfs support, we have to do it this way def remove: if .fstype == "zfs_member" then - "if type zpool >/dev/null; then zpool destroy -f \(.label); fi" + "if type zpool >/dev/null; then zpool destroy -f \(.label); zpool labelclear -f \(.label); fi" elif .fstype == "LVM2_member" then [ "vg=$(pvs \(.path) --noheadings --options vg_name | grep -o '[a-zA-Z0-9-]*')", @@ -14,8 +14,8 @@ def remove: # maybe its zfs [ # the next line has some horrible escaping - "zpool=$(if type zdb >/dev/null; then zdb -l \(.path) | sed -nr $'s/ +name: \\'(.*)\\'/\\\\1/p') else echo ""; fi", - "if [[ -n \"${zpool}\" ]]; then zpool destroy -f \"$zpool\"; fi", + "zpool=$(if type zdb >/dev/null; then zdb -l \(.path) | sed -nr $'s/ +name: \\'(.*)\\'/\\\\1/p'; fi)", + "if [[ -n \"${zpool}\" ]]; then zpool destroy -f \"$zpool\"; zpool labelclear -f \"$zpool\"; fi", "unset zpool" ] else