From 0b0e34ac04c6f31433ad2ca1404073007527f58e Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Sun, 20 Dec 2020 22:23:52 +0100 Subject: [PATCH] Solved bug --- scripts/encryption/storage/raid1/mount_on_boot.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/encryption/storage/raid1/mount_on_boot.sh b/scripts/encryption/storage/raid1/mount_on_boot.sh index 44f1eba..996dbce 100644 --- a/scripts/encryption/storage/raid1/mount_on_boot.sh +++ b/scripts/encryption/storage/raid1/mount_on_boot.sh @@ -2,8 +2,10 @@ # shellcheck disable=SC1090 # Can't follow non-constant source. Use a directive to specify location. # shellcheck disable=SC2154 # Referenced but not assigned source "$(dirname "$(readlink -f "${0}")")/base.sh" || (echo "Loading base.sh failed." && exit 1) -info "Automount raid1 encrypted storages..." -create_luks_key_and_update_cryptab "$mapper_name_1" "$partition_path_1" -create_luks_key_and_update_cryptab "$mapper_name_2" "$partition_path_2" -update_fstab "$mapper_path_1" "$mount_path_1" -success "Installation finished. Please restart :)" +info "Automount raid1 encrypted storages..." && +set_device_mount_partition_and_mapper_paths && +create_luks_key_and_update_cryptab "$mapper_name_1" "$partition_path_1" && +create_luks_key_and_update_cryptab "$mapper_name_2" "$partition_path_2" && +update_fstab "$mapper_path_1" "$mount_path_1" && +success "Installation finished. Please restart :)" || +error