WIP

Author: travier

examples/.gitignore

@@ -10,5 +10,7 @@ bootc-uki/extra-fcos/usr/bin/bootc
 bootc-uki/extra-fcos/usr/lib/dracut/modules.d/37bootc/bootc-initramfs-setup
 bootc-uki/extra/usr/bin/bootc
 bootc-uki/extra/usr/lib/dracut/modules.d/37bootc/bootc-initramfs-setup
+bootc-uki/iid
 bootc-uki/secureboot/
+bootc-uki/tmp
 systemd-bootx64.efi

examples/bootc-bls/build-fcos

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export FROM="${IMAGE:-quay.io/fedora/fedora-coreos:stable}"
-export TAG="${IMAGE:-quay.io/fedora/fedora-coreos-bls:stable}"
+export FROM="quay.io/fedora/fedora-coreos:stable"
+export TAG="quay.io/fedora/fedora-coreos-bls:stable"
 export EXTRA="extra-fcos"
 exec ./build

examples/bootc-uki/build.base

@@ -20,5 +20,5 @@ podman build \
     --from "${FROM}" \
     -t "${TAG}" \
     -f Containerfile.stage1 \
-    --iidfile=tmp/iid \
+    --iidfile=iid \
     "${EXTRA}"

examples/bootc-uki/build.final

@@ -16,7 +16,7 @@ mount /dev/vdb3 tmp
 # rm -rf tmp/sysroot
 mkdir -p tmp/sysroot/composefs
 
-IMAGE_ID="$(sed s/sha256:// tmp/iid)"
+IMAGE_ID="$(sed s/sha256:// iid)"
 ./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}")"
 

examples/to-disk-fcos.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+export IMAGE="quay.io/fedora/fedora-coreos-bls:stable"
+exec ./to-disk.sh

examples/to-disk.sh

@@ -2,8 +2,9 @@
 
 set -euxo pipefail
 
+IMAGE="${IMAGE:-quay.io/fedora/fedora-bootc-bls:42}"
+
 bootc_project="/srv/bootc"
-IMAGE="quay.io/fedora/fedora-bootc-bls:42"
 
 if [[ "$PWD" != "$bootc_project/examples" ]]; then
     echo "Run this command from $bootc_project/examples"
@@ -15,11 +16,12 @@ if [[ ! -f systemd-bootx64.efi ]]; then
     exit 1
 fi
 
-rm -rf ./test.img
+umount -R efi || true
+losetup --detach-all || true
+
 rm -rf ./test.img
 truncate -s 15G test.img
 
-#    --env RUST_LOG=debug \
 #    --env RUST_BACKTRACE=1 \
 # -v /srv/bootc/target/release/bootc:/usr/bin/bootc:ro,Z \
 podman run \
@@ -29,6 +31,7 @@ podman run \
     -v /var/lib/containers:/var/lib/containers \
     -v /var/tmp:/var/tmp \
     -v $PWD:/output \
+    --env RUST_LOG=debug \
     --security-opt label=type:unconfined_t \
     "${IMAGE}" \
     bootc install to-disk \

examples/to-filesystem-fcos.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+export IMAGE="quay.io/fedora/fedora-coreos-uki:stable"
+exec ./to-filesystem.sh

examples/to-filesystem.sh

@@ -2,8 +2,9 @@
 
 set -euxo pipefail
 
+IMAGE="${IMAGE:-quay.io/fedora/fedora-bootc-bls:42}"
+
 bootc_project="/srv/bootc"
-IMAGE="quay.io/fedora/fedora-bootc-bls:42"
 
 if [[ "$PWD" != "$bootc_project/examples" ]]; then
     echo "Run this command from $bootc_project/examples"