diff --git a/minimal/manifest.yaml b/minimal/manifest.yaml index 2c4a62e..544447b 100644 --- a/minimal/manifest.yaml +++ b/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 diff --git a/minimal/systemd-presets.yaml b/minimal/systemd-presets.yaml new file mode 100644 index 0000000..4607210 --- /dev/null +++ b/minimal/systemd-presets.yaml @@ -0,0 +1,11 @@ +# Postprocessing relating to systemd presets on the system. +postprocess: + # 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 diff --git a/standard/manifest.yaml b/standard/manifest.yaml index 8c1e465..2016cc2 100644 --- a/standard/manifest.yaml +++ b/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