From 3235587add77b4fb46557da4f82a4a9d71dbc12f Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Mon, 6 Apr 2026 18:13:53 -0700
Subject: [PATCH] Update for new bootc-image-builder

---
 .gitignore   |  1 +
 build-iso.sh | 28 +++++++++++++---------------
 config.toml  | 44 +++++++++++++++++++++-----------------------
 3 files changed, 35 insertions(+), 38 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/build-iso.sh b/build-iso.sh
index e991c5a..e94c841 100755
--- a/build-iso.sh
+++ b/build-iso.sh
@@ -1,26 +1,24 @@
 #!/usr/bin/env bash
 set -e
 
-IMAGE="ghcr.io/t2linux/fedora-silverblue:unstable"
+IMAGE="ghcr.io/t2linux/fedora-silverblue:43"
+INSTALLER_IMAGE="ghcr.io/t2linux/fedora-silverblue-installer:43"
 
-mkdir output
+mkdir -p build
 
-cp config.toml .tmp-config.toml
-sed -i "s@REPLACE_WITH_IMAGE_NAME@$IMAGE@g" .tmp-config.toml
+sudo podman pull "$IMAGE" "$INSTALLER_IMAGE"
 
-podman pull "$IMAGE"
-
-podman run --rm -it --privileged \
+sudo podman run --rm -it --privileged \
   --platform linux/amd64 \
+  --privileged \
   --security-opt label=type:unconfined_t \
   -v /var/lib/containers/storage:/var/lib/containers/storage \
-  -v "$PWD/output":/output \
-  -v "$PWD/.tmp-config.toml":/config.toml \
+  -v "$PWD/build":/output \
+  -v "$PWD/config.toml":/config.toml \
   quay.io/centos-bootc/bootc-image-builder:latest \
-  --type anaconda-iso \
+  --in-vm \
+  --use-librepo=True \
+  --type bootc-installer \
   --rootfs btrfs \
-  --local \
-  "$IMAGE"
-
-mv output/bootiso/install.iso ./fedora-silverblue.iso
-rm -rf output
+  --bootc-installer-payload-ref "$IMAGE" \
+  "$INSTALLER_IMAGE"
diff --git a/config.toml b/config.toml
index 579d8de..d58fa3a 100644
--- a/config.toml
+++ b/config.toml
@@ -1,24 +1,22 @@
-[customizations.kernel]
-append = "intel_iommu=on iommu=pt mem_sleep=s2idle pcie_ports=native"
+# [customizations.installer.modules]
+# enable = [
+#   "org.fedoraproject.Anaconda.Modules.Storage",
+#   "org.fedoraproject.Anaconda.Modules.Runtime",
+#   "org.fedoraproject.Anaconda.Modules.Timezone",
+#   "org.fedoraproject.Anaconda.Modules.Localization",
+# ]
+# disable = [
+#   "org.fedoraproject.Anaconda.Modules.Network",
+#   "org.fedoraproject.Anaconda.Modules.Security",
+#   "org.fedoraproject.Anaconda.Modules.Services",
+#   "org.fedoraproject.Anaconda.Modules.Users",
+#   "org.fedoraproject.Anaconda.Modules.Subscription",
+# ]
 
-[customizations.installer.modules]
-enable = [
-    "org.fedoraproject.Anaconda.Modules.Localization",
-    "org.fedoraproject.Anaconda.Modules.Timezone",
-]
-disable = [
-    "org.fedoraproject.Anaconda.Modules.Users",
-    "org.fedoraproject.Anaconda.Modules.Network",
-]
-
-[customizations.installer.kickstart]
-contents = """
-graphical
-
-clearpart --all
-rootpw --lock --iscrypted locked
-
-%post
-bootc switch --mutate-in-place --transport registry REPLACE_WITH_IMAGE_NAME
-%end
-"""
+# [customizations.installer.kickstart]
+# contents = """
+# graphical
+# firewall --use-system-defaults
+# network --hostname="localhost"
+# firstboot --enable
+# """