aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-04-26 18:12:52 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-04-26 18:12:52 -0300
commit5db550bf5e7360406f29d8964d2e7e504261c3db (patch)
tree26f9c51d68bfd1f4364d18239bb2559a599b0f9b /share
parentcc74d8ceee791d8fa78683c0ca6390bbc260ec2d (diff)
downloadhydra-5db550bf5e7360406f29d8964d2e7e504261c3db.tar.gz
hydra-5db550bf5e7360406f29d8964d2e7e504261c3db.tar.bz2
Provision: check for swap before doing a luksClose
Diffstat (limited to 'share')
-rwxr-xr-xshare/hydractl/provision6
1 files changed, 5 insertions, 1 deletions
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