From 457c01bfcd6346b8a06420d721fa02a216cea9bf Mon Sep 17 00:00:00 2001 From: xengineering Date: Thu, 9 Jan 2020 10:46:37 +0100 Subject: Bugfix for install_bootloader.sh. --- stages/second_stage.sh | 2 +- util/install_bootloader.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stages/second_stage.sh b/stages/second_stage.sh index 015d89b..c2c0b92 100644 --- a/stages/second_stage.sh +++ b/stages/second_stage.sh @@ -33,6 +33,6 @@ bash configure_initramfs.sh bash configure_users.sh $admin_username $DEFAULT_PASSWORD -bash install_bootloader.sh $efi_partition_path $system_encryption +bash install_bootloader.sh $efi_partition_path $system_encryption $main_partition_path bash configure_desktop.sh diff --git a/util/install_bootloader.sh b/util/install_bootloader.sh index 1f3c4e3..db6c8bc 100644 --- a/util/install_bootloader.sh +++ b/util/install_bootloader.sh @@ -20,6 +20,7 @@ efi_partition_path=$1 system_encryption=$2 +main_partition_path=$3 ############ Add encryption setting in /etc/default/grub before calling grub-mkconfig @@ -34,7 +35,7 @@ grub-install --target=x86_64-efi --efi-directory=/mnt --bootloader-id=GRUB \ if [ $system_encryption == "yes" ];then - cryptdevice_uuid=$(lsblk --fs | grep "${basename $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" -- cgit v1.2.3-70-g09d2