From a6e7212b561662f8ce507e51dd95ddc354785b45 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Feb 27 2025 15:58:35 +0000
Subject: [PATCH 1/2] Migrate systems to a static GRUB config


See: https://pagure.io/workstation-ostree-config/pull-request/591
     https://fedoraproject.org/wiki/Changes/ComposefsAtomicCoreOSIoT
     https://fedoraproject.org/wiki/Changes/ComposefsAtomicDesktops

Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

---

diff --git a/bootupd.yaml b/bootupd.yaml
index 61a6a9a..857de65 100644
--- a/bootupd.yaml
+++ b/bootupd.yaml
@@ -9,24 +9,18 @@ postprocess:
   - |
     #!/bin/bash
     set -xeuo pipefail
+
     # Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload
     /usr/bin/bootupctl backend generate-update-metadata
-
-    # Trigger a bootloader update on boot
-    cat > /usr/lib/systemd/system/bootloader-update.service << 'EOF'
-    [Unit]
-    Description=Update bootloader on boot
-    Documentation=https://github.com/coreos/bootupd
-    ConditionFirmware=uefi
-      
+  
+    # Enable migration to a static GRUB config
+    install -dm0755 /usr/lib/systemd/system/bootloader-update.service.d
+    cat > /usr/lib/systemd/system/bootloader-update.service.d/migrate-static-grub-config.conf << 'EOF'
     [Service]
-    Type=oneshot
-    ExecStart=/usr/bin/bootupctl update
-    RemainAfterExit=yes
-    MountFlags=slave
-                  
-    [Install]     
-    WantedBy=multi-user.target
+    ExecStart=/usr/bin/bootupctl migrate-static-grub-config
     EOF
-    chmod 644 /usr/lib/systemd/system/bootloader-update.service
-    echo "enable bootloader-update.service" > /usr/lib/systemd/system-preset/81-iot.preset
\ No newline at end of file
+
+    echo "enable bootloader-update.service" >> /usr/lib/systemd/system-preset/80-iot.preset
+
+    # Turn permissive mode on for bootupd until all SELinux issues are fixed
+    semanage permissive --noreload --add bootupd_t

From c739a8c05ac86fd6f8b8091e9268e22561eb6a2d Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Feb 27 2025 16:02:20 +0000
Subject: [PATCH 2/2] Enable composefs by default


See: https://pagure.io/workstation-ostree-config/pull-request/591
     https://fedoraproject.org/wiki/Changes/ComposefsAtomicCoreOSIoT
     https://fedoraproject.org/wiki/Changes/ComposefsAtomicDesktops

Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

---

diff --git a/composefs.yaml b/composefs.yaml
new file mode 100644
index 0000000..8a721f3
--- /dev/null
+++ b/composefs.yaml
@@ -0,0 +1,12 @@
+# Enable composefs
+# See: https://fedoraproject.org/wiki/Changes/ComposefsAtomicDesktops
+# https://fedoraproject.org/wiki/Changes/ComposefsAtomicCoreOSIoT
+postprocess:
+  - |
+    #!/usr/bin/env bash
+    set -xeuo pipefail
+
+    cat >> /usr/lib/ostree/prepare-root.conf << 'EOF'
+    [composefs]
+    enabled = yes
+    EOF
diff --git a/fedora-iot-base.yaml b/fedora-iot-base.yaml
index 62a22bc..03e21c3 100644
--- a/fedora-iot-base.yaml
+++ b/fedora-iot-base.yaml
@@ -2,6 +2,8 @@ include:
   - bootupd.yaml
   # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2305291
   - grub2-workaround.yaml
+  # Enable composefs
+  - composefs.yaml
 ref: fedora/rawhide/${basearch}/iot
 repos: []
 selinux: true