From d6830fac44b90c99b997f9ed74d5ba9e4cc774ea Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 14 2026 15:23:22 +0000
Subject: [PATCH 1/2] common: Workaround broken appstream cache update


See: https://gitlab.com/fedora/ostree/sig/-/work_items/103

---

diff --git a/common.yaml b/common.yaml
index 806e9c1..3c88a19 100644
--- a/common.yaml
+++ b/common.yaml
@@ -212,3 +212,32 @@ postprocess:
     # Fix triggerin for samba-client in cups package (not supported by rpm-ostree yet)
     # https://github.com/fedora-silverblue/issue-tracker/issues/532
     ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb
+
+    # Workaround broken appstream cache update
+    # See: https://gitlab.com/fedora/ostree/sig/-/work_items/103
+    cat > /usr/lib/systemd/system/fedora-atomic-desktop-appstream-cache-refresh.service << 'EOF'
+    [Unit]
+    Description=Workaround for Atomic Destkops to refresh the appstream cache
+    Documentation=https://gitlab.com/fedora/ostree/sig/-/work_items/103
+    ConditionPathIsReadWrite=/var
+    ConditionPathExists=/run/ostree-booted
+    After=local-fs.target
+
+    [Service]
+    Type=oneshot
+    RemainAfterExit=yes
+    ExecStart=appstreamcli refresh --force
+    Nice=19
+    IOWeight=10
+
+    [Install]
+    WantedBy=multi-user.target
+    EOF
+
+    cat >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset << 'EOF'
+
+    # See: https://gitlab.com/fedora/ostree/sig/-/work_items/103
+    enable fedora-atomic-desktop-appstream-cache-refresh.service
+    EOF
+
+    systemctl preset fedora-atomic-desktop-appstream-cache-refresh.service

From 31f5be2f8d6423fc782d42fa3541c93e50799283 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 16 2026 10:52:47 +0000
Subject: [PATCH 2/2] common: Workaround broken mandb cache update


See: https://gitlab.com/fedora/ostree/sig/-/work_items/62
See: https://gitlab.com/fedora/bootc/tracker/-/work_items/57
See: https://bugzilla.redhat.com/show_bug.cgi?id=2339038
See: https://discussion.fedoraproject.org/t/f43-change-proposal-man-db-cache-directory-change-self-contained/160773/28

---

diff --git a/common.yaml b/common.yaml
index 3c88a19..d4de223 100644
--- a/common.yaml
+++ b/common.yaml
@@ -241,3 +241,33 @@ postprocess:
     EOF
 
     systemctl preset fedora-atomic-desktop-appstream-cache-refresh.service
+
+    # Workaround broken mandb cache update
+    # See: https://gitlab.com/fedora/ostree/sig/-/work_items/62
+    cat > /usr/lib/systemd/system/fedora-atomic-desktop-mandb-update.service << 'EOF'
+    [Unit]
+    Description=Workaround for Atomic Destkops to update mandb cache
+    Documentation=https://gitlab.com/fedora/ostree/sig/-/work_items/62
+    ConditionPathIsReadWrite=/var
+    ConditionPathExists=/run/ostree-booted
+    After=local-fs.target
+
+    [Service]
+    Type=oneshot
+    RemainAfterExit=yes
+    Environment=MAN_NO_LOCALE_WARNING=1
+    ExecStart=mandb -q
+    Nice=19
+    IOWeight=10
+
+    [Install]
+    WantedBy=multi-user.target
+    EOF
+
+    cat >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset << 'EOF'
+
+    # See: https://gitlab.com/fedora/ostree/sig/-/work_items/62
+    enable fedora-atomic-desktop-mandb-update.service
+    EOF
+
+    systemctl preset fedora-atomic-desktop-mandb-update.service