summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxengineering <mail2xengineering@protonmail.com>2020-01-08 22:27:26 +0100
committerxengineering <mail2xengineering@protonmail.com>2020-01-08 22:27:26 +0100
commit28040393a5ded9909d11743e5cd0cafcd145f931 (patch)
tree676cfc9eb67f532770eb2b88ed0208f6985038c2
parente218e91ad0ec6b660ca9ae7f3c45d5cde5a36fdf (diff)
downloadarchinstall-28040393a5ded9909d11743e5cd0cafcd145f931.tar
archinstall-28040393a5ded9909d11743e5cd0cafcd145f931.tar.zst
archinstall-28040393a5ded9909d11743e5cd0cafcd145f931.zip
Bugfixes for luks encryption.
-rw-r--r--util/install_bootloader.sh2
-rw-r--r--util/print_final_message.sh1
2 files changed, 2 insertions, 1 deletions
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!