From e07c6ada5cb0a7b6db0d9de7e1fb508c36a123ae Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Mon, 7 Nov 2022 22:19:17 +0100 Subject: [PATCH] Backport systemd-resolved fixes for Fedora 36 --- image/mkosi.prepare | 5 +++++ .../dracut/modules.d/39constellation-mount/module-setup.sh | 3 +++ .../modules.d/39constellation-mount/sysusers-dracut.conf | 3 +++ 3 files changed, 11 insertions(+) create mode 100755 image/mkosi.prepare create mode 100644 image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/sysusers-dracut.conf diff --git a/image/mkosi.prepare b/image/mkosi.prepare new file mode 100755 index 000000000..9df06e565 --- /dev/null +++ b/image/mkosi.prepare @@ -0,0 +1,5 @@ +#!/bin/sh +set -euxo pipefail + +# backport of https://github.com/dracutdevs/dracut/commit/dcbe23c14d13ca335ad327b7bb985071ca442f12 +sed -i 's/WantedBy=multi-user.target/WantedBy=basic.target/' /usr/lib/systemd/system/systemd-resolved.service diff --git a/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh b/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh index 446a81ad0..947f5aa01 100644 --- a/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh +++ b/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh @@ -70,4 +70,7 @@ install() { install_path /etc/pki/tls/certs/ inst_simple /etc/pki/tls/certs/ca-bundle.crt \ /etc/pki/tls/certs/ca-bundle.crt + + # backport of https://github.com/dracutdevs/dracut/commit/dcbe23c14d13ca335ad327b7bb985071ca442f12 + inst_simple "$moddir/sysusers-dracut.conf" "$systemdsystemunitdir/systemd-sysusers.service.d/sysusers-dracut.conf" } diff --git a/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/sysusers-dracut.conf b/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/sysusers-dracut.conf new file mode 100644 index 000000000..4e3630d4a --- /dev/null +++ b/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/sysusers-dracut.conf @@ -0,0 +1,3 @@ +# backport of https://github.com/dracutdevs/dracut/commit/dcbe23c14d13ca335ad327b7bb985071ca442f12 +[Unit] +ConditionNeedsUpdate=