examples/bootc*: Migrate from cfsctl to bootc internals cfs

Update bootc examples to use the new unified bootc command interface:
- Replace cfsctl binary with bootc and use 'bootc internals cfs' subcommands
- Rename composefs-setup-root to bootc-initramfs-setup
- Update dracut module from 37composefs to 37bootc
- Remove sudo requirement from podman build commands
- Update service and module configuration files accordingly

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: jeckersb

examples/bootc-bls/Containerfile

@@ -1,10 +1,10 @@
 FROM quay.io/fedora/fedora-bootc:42
 COPY extra /
-COPY cfsctl /usr/bin
+COPY bootc /usr/bin
 
 RUN passwd -d root
 
-# need to have composefs setup root in the initramfs so we need this
+# need to have bootc-initramfs-setup in the initramfs so we need this
 RUN set -x; \
     kver=$(cd /usr/lib/modules && echo *); \
     dracut -vf --install "/etc/passwd /etc/group" /usr/lib/modules/$kver/initramfs.img $kver;

examples/bootc-bls/build

@@ -4,14 +4,15 @@ set -eux
 
 cd "${0%/*}"
 
-cargo build --release --features=pre-6.15 --bin cfsctl --bin composefs-setup-root
+cargo build --release --bin bootc --bin bootc-initramfs-setup
 
-cp ../../target/release/cfsctl .
-cp ../../target/release/composefs-setup-root extra/usr/lib/dracut/modules.d/37composefs/
+cp ../../target/release/bootc .
+cp ../../target/release/bootc-initramfs-setup extra/usr/lib/dracut/modules.d/37bootc/
 
 mkdir -p tmp
 
-sudo podman build \
+podman build \
     -t quay.io/fedora/fedora-bootc-bls:42 \
     -f Containerfile \
     --iidfile=tmp/iid \
+    .

examples/bootc-bls/extra/usr/lib/dracut/modules.d/37composefs/composefs-setup-root.service renamed to examples/bootc-bls/extra/usr/lib/dracut/modules.d/37bootc/bootc-initramfs-setup.service

@@ -27,7 +27,7 @@ OnFailureJobMode=isolate
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/composefs-setup-root
+ExecStart=/usr/bin/bootc-initramfs-setup
 StandardInput=null
 StandardOutput=journal
 StandardError=journal+console

examples/bootc-bls/extra/usr/lib/dracut/modules.d/37bootc/module-setup.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+
+check() {
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst \
+        "${moddir}/bootc-initramfs-setup" /usr/bin/bootc-initramfs-setup
+    inst \
+        "${moddir}/bootc-initramfs-setup.service" \
+        "${systemdsystemunitdir}/bootc-initramfs-setup.service"
+
+    $SYSTEMCTL -q --root "${initdir}" add-wants \
+        'initrd-root-fs.target' 'bootc-initramfs-setup.service'
+}

examples/bootc-bls/extra/usr/lib/dracut/modules.d/37composefs/module-setup.sh

@@ -1,6 +1,6 @@
 FROM quay.io/fedora/fedora-bootc:42
 COPY extra /
-COPY cfsctl /usr/bin
+COPY bootc /usr/bin
 
 RUN passwd -d root
 

examples/bootc-uki/Containerfile.stage1

@@ -4,14 +4,14 @@ set -eux
 
 cd "${0%/*}"
 
-cargo build --release --features=pre-6.15 --bin cfsctl --bin composefs-setup-root
+cargo build --release --bin bootc --bin bootc-initramfs-setup
 
-cp ../../target/release/cfsctl .
-cp ../../target/release/composefs-setup-root extra/usr/lib/dracut/modules.d/37composefs/
+cp ../../target/release/bootc .
+cp ../../target/release/bootc-initramfs-setup extra/usr/lib/dracut/modules.d/37bootc/
 
 mkdir -p tmp
 
-sudo podman build \
+podman build \
     -t quay.io/fedora/fedora-bootc-base-uki:42 \
     -f Containerfile.stage1 \
     --iidfile=tmp/iid \

examples/bootc-uki/build.base

@@ -4,16 +4,16 @@ set -eux
 
 cd "${0%/*}"
 
-cargo build --release --features=pre-6.15 --bin cfsctl --bin composefs-setup-root
+cargo build --release --bin bootc
 
-cp ../../target/release/cfsctl .
+cp ../../target/release/bootc .
 
 rm -rf tmp/sysroot
 mkdir -p tmp/sysroot/composefs
 
 IMAGE_ID="$(sed s/sha256:// tmp/iid)"
-./cfsctl --repo tmp/sysroot/composefs oci pull containers-storage:"${IMAGE_ID}"
-COMPOSEFS_FSVERITY="$(./cfsctl --repo tmp/sysroot/composefs oci compute-id --bootable "${IMAGE_ID}")"
+./bootc internals cfs --repo tmp/sysroot/composefs oci pull containers-storage:"${IMAGE_ID}"
+COMPOSEFS_FSVERITY="$(./bootc internals cfs --repo tmp/sysroot/composefs oci compute-id --bootable "${IMAGE_ID}")"
 
 # See: https://wiki.archlinux.org/title/Unified_Extensible_Firmware_Interface/Secure_Boot
 # Alternative to generate keys for testing: `sbctl create-keys`
@@ -42,6 +42,6 @@ sudo podman build \
 
 rm -rf tmp/efi
 mkdir -p tmp/efi
-./cfsctl --repo tmp/sysroot/composefs oci pull containers-storage:"${IMAGE_ID}"
-./cfsctl --repo tmp/sysroot/composefs oci compute-id --bootable "${IMAGE_ID}"
-./cfsctl --repo tmp/sysroot/composefs oci prepare-boot "${IMAGE_ID}" --bootdir tmp/efi
+./bootc internals cfs --repo tmp/sysroot/composefs oci pull containers-storage:"${IMAGE_ID}"
+./bootc internals cfs --repo tmp/sysroot/composefs oci compute-id --bootable "${IMAGE_ID}"
+./bootc internals cfs --repo tmp/sysroot/composefs oci prepare-boot "${IMAGE_ID}" --bootdir tmp/efi

examples/bootc-uki/build.final

@@ -27,7 +27,7 @@ OnFailureJobMode=isolate
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/composefs-setup-root
+ExecStart=/usr/bin/bootc-initramfs-setup
 StandardInput=null
 StandardOutput=journal
 StandardError=journal+console

examples/bootc-uki/extra/usr/lib/dracut/modules.d/37composefs/composefs-setup-root.service renamed to examples/bootc-uki/extra/usr/lib/dracut/modules.d/37bootc/bootc-initramfs-setup.service

@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+
+check() {
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst \
+        "${moddir}/bootc-initramfs-setup" /usr/bin/bootc-initramfs-setup
+    inst \
+        "${moddir}/bootc-initramfs-setup.service" \
+        "${systemdsystemunitdir}/bootc-initramfs-setup.service"
+
+    $SYSTEMCTL -q --root "${initdir}" add-wants \
+        'initrd-root-fs.target' 'bootc-initramfs-setup.service'
+}