move systemd-preset enablement code to minimal
Arguably we still want to remove rpm systemd enablements and use the presets for the original image we create for all of our images.
This commit is contained in:
parent
5fb935b7db
commit
4888be4e19
3 changed files with 12 additions and 9 deletions
|
|
@ -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
|
||||
|
|
|
|||
11
minimal/systemd-presets.yaml
Normal file
11
minimal/systemd-presets.yaml
Normal file
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue