aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-08-09 13:15:24 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-08-09 13:15:24 -0300
commit27a9a9ee7c597ee07a7fb76dd056b61876ba55cc (patch)
treefec388234001c4a265d42322893d0af6c130c2a6
parent3b641d65e139f4d9370cd4c2290227656b4b7c76 (diff)
downloadhydra-27a9a9ee7c597ee07a7fb76dd056b61876ba55cc.tar.gz
hydra-27a9a9ee7c597ee07a7fb76dd056b61876ba55cc.tar.bz2
Provision: changing temporary crypt volnames
-rwxr-xr-xshare/hydractl/provision10
1 files changed, 5 insertions, 5 deletions
diff --git a/share/hydractl/provision b/share/hydractl/provision
index 11b141f..b363809 100755
--- 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