From 64d487f193650dea0d228eb71e66d15acbef167a Mon Sep 17 00:00:00 2001 From: renner <80410025+renner0e@users.noreply.github.com> Date: Fri, 12 Jun 2026 06:52:07 +0200 Subject: [PATCH] feat(just): add composefs-backend option to disk-image (#2370) This recipe doesn't actually work yet without any changes to the image because we don't add the bootc module to the initramfs and don't install systemd-boot. This makes it easier to test the composefs native backend. --- Justfile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Justfile b/Justfile index 2ffb695e..723ab67b 100644 --- a/Justfile +++ b/Justfile @@ -766,7 +766,7 @@ bootc $image="aurora" $tag="latest" $flavor="main" *ARGS: # Create bootable image [group('Utility')] -disk-image $image="aurora" $tag="latest" $flavor="main" ghcr="0" $bootc_fs="btrfs": +disk-image $image="aurora" $tag="latest" $flavor="main" ghcr="0" $bootc_fs="btrfs" $backend="ostree": #!/usr/bin/env bash set -eoux pipefail @@ -791,7 +791,17 @@ disk-image $image="aurora" $tag="latest" $flavor="main" ghcr="0" $bootc_fs="btrf fi fi - {{ just }} bootc "${image}" "${tag}" "${flavor}" install to-disk --generic-image --bootloader grub --via-loopback /data/bootable.img --filesystem "${bootc_fs}" --wipe + BOOTC_INSTALL_ARGS=() + BOOTC_INSTALL_ARGS+=("--generic-image" "--via-loopback" "/data/bootable.img" "--wipe") + BOOTC_INSTALL_ARGS+=("--filesystem ${bootc_fs}") + + if [[ "${backend}" == "ostree" ]]; then + BOOTC_INSTALL_ARGS+=("--bootloader grub") + else + BOOTC_INSTALL_ARGS+=("--bootloader systemd" "--composefs-backend") + fi + + {{ just }} bootc "${image}" "${tag}" "${flavor}" install to-disk "${BOOTC_INSTALL_ARGS[@]}" # FIXME: Please consider using podman push in the future for signing as well instead of temporary tag + cosign # See: https://github.com/ublue-os/aurora/pull/2199