Merge remote-tracking branch 'toabctl/boot-partition' into ubuntu/master

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (23.10.41) UNRELEASED; urgency=medium
+
+  * ubuntu-cpc: create a new boot partition on all UEFI cloud-images
+  * ubuntu-cpc: refactor the logic to define the disk image size for UEFI
+    images
+
+ -- Gauthier Jolly <gauthier.jolly@canonical.com>  Thu, 14 Sep 2023 09:48:14 +0200
+
 livecd-rootfs (23.10.40) mantic; urgency=medium
 
   * Enhance unminimize to transform into a base image

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

live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

@@ -12,17 +12,20 @@ esac
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
 
-if [ "$ARCH" = "amd64" ]; then
-    IMAGE_SIZE=3758096384 # bump to 3.5G (3584*1024**2); Since Kinetic amd64 need more then the default 2.2G
-fi
-
-if [ "$ARCH" = "armhf" ]; then
-    IMAGE_SIZE=3758096384 # bump to 3.5G (3584*1024**2); Since Jammy armhf need more then the default 2.2G
-fi
-
-if [ "$ARCH" = "riscv64" ]; then
-    IMAGE_SIZE=4831838208 # bump to 4.5G (4608*1024**2); initrd creation fails with "No space left" with 3.5G
-fi
+case "$ARCH" in
+  amd64|arm64|armhf)
+    # 3.5 GiB
+    # Since Kinetic amd64 need more then the default 2.2G
+    # Since Jammy armhf need more then the default 2.2G
+    # Since Mantic arm64 need more then the default 2.2G
+    IMAGE_SIZE=3758096384 # bump to 3.5G (3584*1024**2);
+    ;;
+  riscv64)
+    # 4.5 GiB
+    # initrd creation fails with "No space left" with 3.5G
+    IMAGE_SIZE=4831838208 # bump to 4.5G (4608*1024**2);
+    ;;
+esac
 
 . config/binary
 
@@ -36,6 +39,8 @@ create_partitions() {
             sgdisk "${disk_image}" \
                    --new=15:0:204800 \
                    --typecode=15:ef00 \
+                   --new=16::1G \
+                   --typecode=16:ea00 \
                    --new=1:
             ;;
         riscv64)
@@ -43,6 +48,8 @@ create_partitions() {
                    --set-alignment=2 \
                    --new=15::+106M \
                    --typecode=15:ef00 \
+                   --new=16::1G \
+                   --typecode=16:ea00 \
                    --new=1:: \
                    --attributes=1:set:2
             ;;
@@ -50,6 +57,8 @@ create_partitions() {
             sgdisk "${disk_image}" \
                    --new=14::+4M \
                    --new=15::+106M \
+                   --new=16::1G \
+                   --typecode=16:ea00 \
                    --new=1::
             sgdisk "${disk_image}" \
                    -t 14:ef02 \
@@ -60,15 +69,26 @@ create_partitions() {
         --print
 }
 
-create_and_mount_uefi_partition() {
+create_and_mount_boot_partitions() {
     uefi_dev="${loop_device}p15"
+    boot_dev="${loop_device}p16"
     mountpoint="$1"
+
     mkfs.vfat -F 32 -n UEFI "${uefi_dev}"
+    mkfs.ext4 -L BOOT "${boot_dev}"
+
+    # copying what was on the rootfs to the new boot partition
+    mount "${boot_dev}" "${mountpoint}"/mnt
+    mv "${mountpoint}"/boot/* "${mountpoint}"/mnt
+    umount "${boot_dev}"
+
+    mount "${boot_dev}" "${mountpoint}"/boot
 
     mkdir -p "${mountpoint}"/boot/efi
     mount "${uefi_dev}" "$mountpoint"/boot/efi
 
     cat << EOF >> "mountpoint/etc/fstab"
+LABEL=BOOT	/boot	ext4	defaults	0 2
 LABEL=UEFI	/boot/efi	vfat	umask=0077	0 1
 EOF
 }
@@ -77,7 +97,7 @@ install_grub() {
     mkdir mountpoint
     mount_partition "${rootfs_dev_mapper}" mountpoint
 
-    create_and_mount_uefi_partition mountpoint
+    create_and_mount_boot_partitions mountpoint
 
     echo "(hd0) ${loop_device}" > mountpoint/tmp/device.map
     mkdir -p mountpoint/etc/default/grub.d
@@ -149,7 +169,7 @@ install_grub() {
     chroot mountpoint apt-get -y clean
 
     rm mountpoint/tmp/device.map
-    umount mountpoint/boot/efi
+    umount -R mountpoint/boot
     mount
     umount_partition mountpoint
     rmdir mountpoint