Provision: changing temporary crypt volnames

diff --git a/share/hydractl/provision b/share/hydractl/provision
index 11b141f370cc0d071f6e25a84b1d1f99819a9ce6..b3638099e474c713bbad4c3dbd56ee8616fe6f4e 100755 (executable)
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -59,11 +59,11 @@ function hydra_provision_create_volume {
   if [ "$encrypt" == "y" ]; then
     echo "Creating encrypted $volume device..."
     hydra_safe_run cryptsetup -h sha256 -c aes-cbc-essiv:sha256 -s 256 luksFormat /dev/mapper/$vg-$volume
-    hydra_safe_run cryptsetup luksOpen /dev/mapper/$vg-$volume $volume
-    hydra_safe_run mkfs.ext4 /dev/mapper/$volume
+    hydra_safe_run cryptsetup luksOpen /dev/mapper/$vg-$volume provision-$volume
+    hydra_safe_run mkfs.ext4 /dev/mapper/provision-$volume
 
     if [ "$volume" == "root" ]; then
-      install_device="/dev/mapper/root"
+      install_device="/dev/mapper/provision-root"
     fi
   else
     echo "Creating $volume device..."
@@ -231,7 +231,7 @@ if [ "$home_size" != "0" ]; then
   mkdir /tmp/debootstrap/home
 
   if [ "$encrypt" == "y" ]; then
-    hydra_safe_run mount /dev/mapper/home /tmp/debootstrap/home
+    hydra_safe_run mount /dev/mapper/provision-home /tmp/debootstrap/home
   else
     hydra_safe_run mount /dev/mapper/$vg-home /tmp/debootstrap/home
   fi
@@ -241,7 +241,7 @@ if [ "$var_size" != "0" ]; then
   mkdir /tmp/debootstrap/var
 
   if [ "$encrypt" == "y" ]; then
-    hydra_safe_run mount /dev/mapper/var /tmp/debootstrap/var
+    hydra_safe_run mount /dev/mapper/provision-var /tmp/debootstrap/var
   else
     hydra_safe_run mount /dev/mapper/$vg-var /tmp/debootstrap/var
   fi