From 28040393a5ded9909d11743e5cd0cafcd145f931 Mon Sep 17 00:00:00 2001 From: xengineering Date: Wed, 8 Jan 2020 22:27:26 +0100 Subject: Bugfixes for luks encryption. --- util/install_bootloader.sh | 2 +- util/print_final_message.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/util/install_bootloader.sh b/util/install_bootloader.sh index 4d3e9b9..1f3c4e3 100644 --- a/util/install_bootloader.sh +++ b/util/install_bootloader.sh @@ -34,7 +34,7 @@ grub-install --target=x86_64-efi --efi-directory=/mnt --bootloader-id=GRUB \ if [ $system_encryption == "yes" ];then - cryptdevice_uuid=$(lsblk --fs | grep $main_partition_path | awk '{print $3}') + cryptdevice_uuid=$(lsblk --fs | grep "${basename $main_partition_path}" | awk '{print $3}') echo "cryptdevice_uuid: $cryptdevice_uuid" old_kernel_param_line=$(cat /etc/default/grub | grep "GRUB_CMDLINE_LINUX_DEFAULT") echo "old_kernel_param_line: $old_kernel_param_line" diff --git a/util/print_final_message.sh b/util/print_final_message.sh index 9864470..46e99b9 100644 --- a/util/print_final_message.sh +++ b/util/print_final_message.sh @@ -25,6 +25,7 @@ cat << EOF ##################################################################### The default password for your user and root is '${default_password}'. + It is also the default password for drive encryption. You can now power off your machine with 'poweroff', remove the installation media and boot your new Arch Linux machine! -- cgit v1.2.3-70-g09d2