Merge branch 'dusty-presets' into 'main'

move systemd-preset enablement code to minimal; disable dnf-makecache.timer

See merge request fedora/bootc/base-images!181

minimal/manifest.yaml

@@ -27,6 +27,7 @@ include:
   - initramfs.yaml
   - basic-fixes.yaml
   - kernel-install.yaml
+  - systemd-presets.yaml
 
 packages:
   # this is implied by dependencies but let's make it explicit

minimal/systemd-presets.yaml

@@ -0,0 +1,20 @@
+# Postprocessing relating to systemd presets on the system.
+postprocess:
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+    # Override some of the default presets.
+    cat <<EOF > usr/lib/systemd/system-preset/85-bootc.preset
+    # Disable dnf-makecache.timer on bootc/image mode systems
+    # https://github.com/coreos/fedora-coreos-tracker/issues/1896#issuecomment-2848251507
+    disable dnf-makecache.timer
+    EOF
+  # Undo RPM scripts enabling units; we want the presets to be canonical
+  # https://github.com/projectatomic/rpm-ostree/issues/1803
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+    rm -rf /etc/systemd/system/*
+    systemctl preset-all
+    rm -rf /etc/systemd/user/*
+    systemctl --user --global preset-all

standard/manifest.yaml

@@ -59,15 +59,6 @@ packages-aarch64:
   - irqbalance
 
 postprocess:
-  # Undo RPM scripts enabling units; we want the presets to be canonical
-  # https://github.com/projectatomic/rpm-ostree/issues/1803
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-    rm -rf /etc/systemd/system/*
-    systemctl preset-all
-    rm -rf /etc/systemd/user/*
-    systemctl --user --global preset-all
   # See: https://github.com/coreos/fedora-coreos-tracker/issues/1253
   #      https://bugzilla.redhat.com/show_bug.cgi?id=2112857
   #      https://github.com/coreos/rpm-ostree/issues/3918