From c31dccfe20109df0e5e7f5ff3bb1db2aa50cecb9 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 13 2025 19:45:03 +0000
Subject: [PATCH 1/4] fedora: Enable fedora-third-party-refresh unit


Enable the fedora-third-party-refresh.service unit to make sure that
Fedora Third Party repos configuration updates are applied after
updates, on boot.

On package mode systems, updates to the Fedora Third Party configuration
and repos are triggered on package updates & changes using scriplets and
tansfiletriggerin triggers.

None of those will apply to Atomic Desktops thus this service unit was
created, but never enabled.

We need this enabled to make sure that the Google Chrome repo (disabled
in the following commit) is disabled on rebase to Fedora 43, before any
package layering operation is triggered.

---

diff --git a/bootupd.yaml b/bootupd.yaml
index 4f49b5e..68b7829 100644
--- a/bootupd.yaml
+++ b/bootupd.yaml
@@ -19,7 +19,7 @@ postprocess:
     ExecStart=/usr/bin/bootupctl migrate-static-grub-config
     EOF
 
-    echo "enable bootloader-update.service" > /usr/lib/systemd/system-preset/81-atomic-desktop.preset
+    echo "enable bootloader-update.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset
 
     # Turn permissive mode on for bootupd until all SELinux issues are fixed
     semanage permissive --noreload --add bootupd_t
diff --git a/common.yaml b/common.yaml
index 1b0c54a..73f0135 100644
--- a/common.yaml
+++ b/common.yaml
@@ -25,6 +25,8 @@ include:
   - kernel-install.yaml
   # Enable composefs
   - composefs.yaml
+  # Fixes for Fedora Third Party
+  - fedora.yaml
 
 arch-include:
   x86_64:
diff --git a/fedora.yaml b/fedora.yaml
new file mode 100644
index 0000000..7630924
--- /dev/null
+++ b/fedora.yaml
@@ -0,0 +1,8 @@
+# Enable the fedora-third-party-refresh.service unit that was meant for Atomic
+# Desktops but never got enabled.
+postprocess:
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+
+    echo "enable fedora-third-party-refresh.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset

From 50d1c81ab526968e26b6eac6e83a3638d9dfc6db Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 13 2025 19:45:31 +0000
Subject: [PATCH 2/4] fedora: Skip Google Chrome RPM repo in Fedora Third Party


Skip enabling this repo as it currently creates issues with package
layering.

Workaroud for: https://github.com/coreos/rpm-ostree/issues/5494

---

diff --git a/fedora.yaml b/fedora.yaml
index 7630924..de81bff 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -1,8 +1,12 @@
 # Enable the fedora-third-party-refresh.service unit that was meant for Atomic
 # Desktops but never got enabled.
+# Remove the Google Chrome repo from the list of Fedora Third Party enabled
+# repos. Workaround for https://github.com/coreos/rpm-ostree/issues/5494
 postprocess:
   - |
     #!/bin/bash
     set -xeuo pipefail
 
     echo "enable fedora-third-party-refresh.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset
+
+    sed -i -e '/google-chrome/,+2d' /usr/lib/fedora-third-party/conf.d/fedora-workstation.conf

From f7df414a0deb4cac67d42870ce760d039a611490 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 13 2025 19:52:33 +0000
Subject: [PATCH 3/4] fedora: Remove preset for fedora-third-party-refresh


Moved to fedora-release package.

See: https://bugzilla.redhat.com/show_bug.cgi?id=2403093
See: https://src.fedoraproject.org/rpms/fedora-release/pull-request/390

---

diff --git a/fedora.yaml b/fedora.yaml
index de81bff..9dbe8a1 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -1,5 +1,3 @@
-# Enable the fedora-third-party-refresh.service unit that was meant for Atomic
-# Desktops but never got enabled.
 # Remove the Google Chrome repo from the list of Fedora Third Party enabled
 # repos. Workaround for https://github.com/coreos/rpm-ostree/issues/5494
 postprocess:
@@ -7,6 +5,4 @@ postprocess:
     #!/bin/bash
     set -xeuo pipefail
 
-    echo "enable fedora-third-party-refresh.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset
-
     sed -i -e '/google-chrome/,+2d' /usr/lib/fedora-third-party/conf.d/fedora-workstation.conf

From dc162cd11261412d85587622f5e8200f5b87a5a6 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 13 2025 19:52:35 +0000
Subject: [PATCH 4/4] bootupd: Remove preset for bootloader-update


Moved to fedora-release package.

See: https://bugzilla.redhat.com/show_bug.cgi?id=2403094
See: https://src.fedoraproject.org/rpms/fedora-release/pull-request/390

---

diff --git a/bootupd.yaml b/bootupd.yaml
index 68b7829..fb03fb9 100644
--- a/bootupd.yaml
+++ b/bootupd.yaml
@@ -19,7 +19,5 @@ postprocess:
     ExecStart=/usr/bin/bootupctl migrate-static-grub-config
     EOF
 
-    echo "enable bootloader-update.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset
-
     # Turn permissive mode on for bootupd until all SELinux issues are fixed
     semanage permissive --noreload --add bootupd_t