From 626e59b4e5a6ea4054b0f2d6085b4cca56ffda07 Mon Sep 17 00:00:00 2001 From: Gauthier Jolly Date: Mon, 7 Aug 2023 11:58:18 +0200 Subject: [PATCH 1/4] 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 From a8b2a9b01e8f7351a7adabbef1cdcd835ff6995e Mon Sep 17 00:00:00 2001 From: Gauthier Jolly Date: Mon, 7 Aug 2023 11:53:32 +0200 Subject: [PATCH 2/4] ubuntu-cpc: create a partition for /boot on all UEFI images In order to support better support Full Disk Encryption on the clouds, the boot assets have to sit on an un-encrypted partition. We've tried mounting the ESP on /boot before but it didn't work as /boot has to support linking for DPKG to work and the ESP has to be FAT. --- .../hooks.d/base/disk-image-uefi.binary | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 020dd33f..53148fde 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -36,6 +36,8 @@ create_partitions() { sgdisk "${disk_image}" \ --new=15:0:204800 \ --typecode=15:ef00 \ + --new=16::1G \ + --typecode=16:ea00 \ --new=1: ;; riscv64) @@ -43,6 +45,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 +54,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 +66,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 +94,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 +166,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 From 51d4756700f2b91add5a46ae078025f1b1a9d36c Mon Sep 17 00:00:00 2001 From: Gauthier Jolly Date: Tue, 22 Aug 2023 16:10:50 +0200 Subject: [PATCH 3/4] ubuntu-cpc: increase arm64 image size This is needed following the addition of the new boot partition. This also gives us the opportunity to refactor the logic and use a case statement instead of ifs --- .../hooks.d/base/disk-image-uefi.binary | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 53148fde..3685e464 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/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 From f35ff6d0d52c4e8f43ff5911bd98f8f3f9fd874f Mon Sep 17 00:00:00 2001 From: Gauthier Jolly Date: Wed, 23 Aug 2023 14:16:59 +0200 Subject: [PATCH 4/4] update d/c --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 815c5d77..82d24d6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (23.10.37) 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 Thu, 14 Sep 2023 09:48:14 +0200 + livecd-rootfs (23.10.36) mantic; urgency=medium * Since we restored the minimal layer, we also need to adjust all hook