From 04cb6216bee8460e6778a84d916d968cf74b58a3 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Sun, 20 Dec 2020 22:17:07 +0100
Subject: [PATCH] Solved bugs

---
 scripts/encryption/storage/base.sh        |  2 +-
 scripts/encryption/storage/raid1/base.sh  |  4 +++-
 scripts/encryption/storage/raid1/setup.sh | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/encryption/storage/base.sh b/scripts/encryption/storage/base.sh
index 9141734..8656551 100644
--- a/scripts/encryption/storage/base.sh
+++ b/scripts/encryption/storage/base.sh
@@ -4,7 +4,7 @@
 # shellcheck disable=SC2154  # Referenced but not assigned
 # shellcheck disable=SC1090  # Can't follow non-constant source. Use a directive to specify location.
 # shellcheck disable=SC2001  # See if you can use ${variable//search/replace} instead
-source "$(dirname "$(readlink -f "${0}")")/../../base.sh" || (echo "Loading base.sh failed." && exit 1)
+source "$(dirname "$(readlink -f "${0}")")/../../../base.sh" || (echo "Loading base.sh failed." && exit 1)
 
 set_device_mount_partition_and_mapper_paths(){
   set_device_path &&
diff --git a/scripts/encryption/storage/raid1/base.sh b/scripts/encryption/storage/raid1/base.sh
index 256b2d9..e2046a5 100644
--- a/scripts/encryption/storage/raid1/base.sh
+++ b/scripts/encryption/storage/raid1/base.sh
@@ -11,10 +11,12 @@ set_raid1_devices_mount_partition_and_mapper_paths(){
   mapper_name_1=$mapper_name &&
   mapper_path_1=$mapper_path &&
   mount_path_1=$mount_path &&
+  device_path_1=$device_path &&
   info "RAID1 partition 2..." &&
   set_device_mount_partition_and_mapper_paths &&
   partition_path_2=$partition_path &&
   mapper_name_2=$mapper_name &&
   mapper_path_2=$mapper_path &&
-  mount_path_2=$mount_path || error
+  mount_path_2=$mount_path &&
+  device_path_2=$device_path || error
 }
diff --git a/scripts/encryption/storage/raid1/setup.sh b/scripts/encryption/storage/raid1/setup.sh
index 3124806..e5df98a 100644
--- a/scripts/encryption/storage/raid1/setup.sh
+++ b/scripts/encryption/storage/raid1/setup.sh
@@ -9,13 +9,13 @@ source "$(dirname "$(readlink -f "${0}")")/base.sh" || (echo "Loading base.sh fa
 
 set_raid1_devices_mount_partition_and_mapper_paths
 
-info "Encrypting $partition_path_1..." &&
-cryptsetup luksFormat "$partition_path_1" &&
-info "Encrypting $partition_path_2..." &&
-cryptsetup luksFormat "$partition_path_2" &&
+info "Encrypting $device_path_1..." &&
+cryptsetup luksFormat "$device_path_1" &&
+info "Encrypting $device_path_2..." &&
+cryptsetup luksFormat "$device_path_2" &&
 blkid | tail -2 &&
-cryptsetup luksOpen "$partition_path_1" "$mapper_name_1" &&
-cryptsetup luksOpen "$partition_path_2" "$mapper_name_2" &&
+cryptsetup luksOpen "$device_path_1" "$mapper_name_1" &&
+cryptsetup luksOpen "$device_path_2" "$mapper_name_2" &&
 cryptsetup status "$mapper_path_1" &&
 cryptsetup status "$mapper_path_2" &&
 mkfs.btrfs -m raid1 -d raid1 "$mapper_path_1" "$mapper_path_2" &&