From 626e59b4e5a6ea4054b0f2d6085b4cca56ffda07 Mon Sep 17 00:00:00 2001
From: Gauthier Jolly <gauthier.jolly@canonical.com>
Date: Mon, 7 Aug 2023 11:58:18 +0200
Subject: [PATCH] functions: add support for mounting boot partition

If the partition exists, we should mount it on /boot. Partition 16 was
chosen because it is not used anywhere else in livecd-rootfs yet.
---
 live-build/functions | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/live-build/functions b/live-build/functions
index 84e062c9..51eee0eb 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -208,6 +208,11 @@ mount_disk_image() {
     mount_image ${disk_image} 1
     mount_partition "${rootfs_dev_mapper}" $mountpoint
 
+    local boot_dev="${loop_device}p16"
+    if [ -b ${boot_dev} -a -e $mountpoint/boot ]; then
+        mount "${boot_dev}" $mountpoint/boot
+    fi
+
     local uefi_dev="${loop_device}p15"
     if [ -b ${uefi_dev} -a -e $mountpoint/boot/efi ]; then
         mount "${uefi_dev}" $mountpoint/boot/efi