Merge pull request #705 from TheYoctoJester/configurable_boot_partition

feat: make boot partition mount point configurable

configs/mender_convert_config

@@ -230,6 +230,20 @@ MENDER_ENABLE_PARTUUID="n"
 # Partition used as the boot partition.
 MENDER_BOOT_PART=""
 
+# Path to mount the boot partition in the root filesystem
+#
+# In order to access the boot partition from the running system,
+# it needs to be mounted to a defined directory location.
+# By default, this is
+# - /boot/efi: for GRUB-EFI based integrations
+# - /uboot: for all other integrations
+#
+# The value of this variable overrides all defaults.
+# Example:
+#   MENDER_BOOT_PART_MOUNT_LOCATION="/boot/firmware"
+#
+#MENDER_BOOT_PART_MOUNT_LOCATION=""
+
 # Partition used as the first (A) rootfs partition.
 MENDER_ROOTFS_PART_A=""
 

mender-convert-modify

@@ -186,10 +186,14 @@ run_and_log_cmd "echo -n ${VERSION_STRING} | sudo tee work/rootfs/etc/mender/scr
 
 log_info "Installing a custom /etc/fstab (see ${MENDER_CONVERT_LOG_FILE} for more info)"
 
-if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
-    boot_part_mountpoint="/boot/efi"
+if [ -n "${MENDER_BOOT_PART_MOUNT_LOCATION:-}" ]; then
+    boot_part_mountpoint="${MENDER_BOOT_PART_MOUNT_LOCATION}"
 else
-    boot_part_mountpoint="/uboot"
+    if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
+        boot_part_mountpoint="/boot/efi"
+    else
+        boot_part_mountpoint="/uboot"
+    fi
 fi
 
 run_and_log_cmd "sudo mkdir -p work/rootfs/${boot_part_mountpoint}"