installation/:

- Stop copying the EFI directory.
- Fix the variables locating the EFI material.

installation/env.sh

@@ -31,12 +31,12 @@ MCA_PACKAGE_URL=${URL_PATTERN}/${MCA_PACKAGE_FILE}
 FLUENTBIT_PACKAGE_URL=${URL_PATTERN}/${FLUENTBIT_PACKAGE_FILE}
 
 # used mainly in installation/install.sh and installation/uninstall.sh
-SOURCE_EFI_DIR=/boot/efi/EFI/
-TARGET_EFI_DIR=/EFI/
-SOURCE_EFI_DIR=`realpath -m $SOURCE_EFI_DIR`
-TARGET_EFI_DIR=`realpath -m $TARGET_EFI_DIR`
-SOURCE_IMAGE_DIR=$SOURCE_EFI_DIR/Linux/
-TARGET_IMAGE_DIR=$TARGET_EFI_DIR/Linux/
+EFI_PARTITION_MOUNT_POINT=/boot/efi/
+RELATIVE_EFI_IMAGE_DIR=/EFI/Linux/
+EFI_IMAGE_DIR=${EFI_PARTITION_MOUNT_POINT}/${RELATIVE_EFI_IMAGE_DIR}
+EFI_PARITITON_MOUNT_POINT=$(realpath -m $EFI_PARTITION_MOUNT_POINT)
+RELATIVE_EFI_IMAGE_DIR=$(realpath -m $RELATIVE_EFI_IMAGE_DIR)
+EFI_IMAGE_DIR=$(realpath -m $EFI_IMAGE_DIR)
 dracut_output_file=dracut-output
 
 #TARGET_DISK=/dev/nvme1n1

installation/install.sh

@@ -40,7 +40,7 @@ get_partition_id () {
 
 root_partition_type="Linux filesystem"
 efi_partition_type="EFI System"
-TARGET_EFI_PARTITION=$(get_partition_path "$efi_partition_type")
+EFI_PARTITION_MOUNT_POINT=$(get_partition_path "$efi_partition_type")
 ROOT_PARTITION_ID=$(get_partition_id "$root_partition_type")
 default_boot_num=100
 
@@ -63,13 +63,13 @@ efibootmgr -b "$default_boot_num" -B || true
 rm -f $dracut_output_file
 dracut -c ./dracut.module/dracut.conf --force |& tee -a $dracut_output_file
 # the next line parses dracut output and extracts the path of the newly generated image
-uefi_image_name=`grep "Creating image file" $dracut_output_file | sed -E "s|.*$SOURCE_IMAGE_DIR(.*)'.*|\1|g"`
+uefi_image_name=`grep "Creating image file" $dracut_output_file | sed -E "s|.*$EFI_IMAGE_DIR(.*)'.*|\1|g"`
 
 # Why? The boot manager seems to forget the boot option if this is not done.
-mkdir -p $TARGET_EFI_DIR
-cp -rv $SOURCE_EFI_DIR/* $TARGET_EFI_DIR
+#mkdir -p $TARGET_EFI_DIR
+#cp -rv $SOURCE_EFI_DIR/* $TARGET_EFI_DIR
 
 # Set the image as a boot option
-efibootmgr -b "$default_boot_num" --create --disk $TARGET_EFI_PARTITION --label "test_deploy" --loader $TARGET_IMAGE_DIR/$uefi_image_name
+efibootmgr -b "$default_boot_num" --create --disk $EFI_PARTITION_MOUNT_POINT --label "test_deploy" --loader ${RELATIVE_EFI_IMAGE_DIR}/$uefi_image_name
 
-echo "New initramfs image: "$TARGET_IMAGE_DIR/$uefi_image_name
+echo "New initramfs image: "${EFI_IMAGE_DIR}/$uefi_image_name