From 58c1bbf05f962c75c620d5a6e51db75f2327d632 Mon Sep 17 00:00:00 2001
From: Philip Peterson <1326208+philip-peterson@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:51:42 -0800
Subject: [PATCH] Disk image: btrfs root from the config, not --rootfs

bootc-image-builder panics on --rootfs btrfs with a disk size.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 Taskfile.yml     |  3 +--
 disk/config.toml | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index 2b76ad4..1fb41f6 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -155,7 +155,7 @@ tasks:
       - task: export-to-storage
         vars: { IMAGES: "{{.IMAGE}}" }
       - mkdir -p {{.OUTPUT_DIR}}
-      # --rootfs btrfs: what Aurora installs with, as in build-installer-iso.
+      # Root on btrfs, as Aurora installs it: disk/config.toml.
       - >-
         {{.SUDO}} {{.CONTAINER_RUNTIME}} run --rm --privileged {{.PULL_FLAG}}
         --security-opt label=type:unconfined_t
@@ -164,7 +164,6 @@ tasks:
         -v {{.STORAGE}}:/var/lib/containers/storage
         {{.BIB_IMAGE}}
         --type qcow2
-        --rootfs btrfs
         localhost/{{.IMAGE}}
     generates:
       - "{{.OUTPUT_DIR}}/qcow2/disk.qcow2"
diff --git a/disk/config.toml b/disk/config.toml
index afe62bf..d88dd3e 100644
--- a/disk/config.toml
+++ b/disk/config.toml
@@ -1,8 +1,19 @@
 # bootc-image-builder's config for the disk image (task build-disk-image).
 # No user: the image has none, so plasma-setup (Aurora's, enabled by
-# default) creates the first one at first boot. Only the disk's minimum
-# size (customizations.filesystem isn't supported for disk images); a
-# qcow2 is sparse, so the download is the size of what's written, not 64
-# GiB.
+# default) creates the first one at first boot.
+#
+# A 64 GiB disk, root on btrfs as Aurora installs it. qcow2 is sparse, so
+# the download is the size of what's written. The btrfs partition goes here
+# rather than in --rootfs: bootc-image-builder panics on --rootfs btrfs
+# with a disk size ("unknown fs type: btrfs for /"), and doesn't support
+# customizations.filesystem for disk images.
 [customizations.disk]
 minsize = "64 GiB"
+
+[[customizations.disk.partitions]]
+type = "btrfs"
+minsize = "60 GiB"
+
+[[customizations.disk.partitions.subvolumes]]
+name = "root"
+mountpoint = "/"