From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 26 Apr 2017 21:12:52 +0000 (-0300)
Subject: Provision: check for swap before doing a luksClose
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5db550bf5e7360406f29d8964d2e7e504261c3db;p=hydra.git

Provision: check for swap before doing a luksClose
---

diff --git a/share/hydractl/provision b/share/hydractl/provision
index e3cef31..2ca8c0a 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -503,7 +503,11 @@ fi
 
 echo "Umounting installation device..."
 hydra_sudo_run umount $WORK/sys $WORK/proc $WORK/dev $WORK
-hydra_sudo_run cryptsetup luksClose provision-swap
+
+if [ "$swap_size" != "0" ]; then
+  hydra_sudo_run cryptsetup luksClose provision-swap
+fi
+
 hydra_sudo_run cryptsetup luksClose provision-root
 hydra_sudo_run vgchange -a n $vg