Solved bugs

This commit is contained in:
Kevin Veen-Birkenbach 2020-12-20 22:17:07 +01:00
parent cd82cd4337
commit 04cb6216be
3 changed files with 10 additions and 8 deletions

View File

@ -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 &&

View File

@ -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
}

View File

@ -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" &&