Adding upstream version 060+5.upstream/060+5

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 60 insertions, 0 deletions

diff --git a/modules.d/01systemd-resolved/module-setup.sh b/modules.d/01systemd-resolved/module-setup.sh
new file mode 100755
index 0000000..0c2e8c2
--- /dev/null
+++ b/modules.d/01systemd-resolved/module-setup.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+# This file is part of dracut.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Prerequisite check(s) for module.
+check() {
+
+    # If the binary(s) requirements are not fulfilled the module can't be installed
+    require_binaries \
+        resolvectl \
+        "$systemdutildir"/systemd-resolved \
+        || return 1
+
+    # Return 255 to only include the module, if another module requires it.
+    return 255
+
+}
+
+# Module dependency requirements.
+depends() {
+
+    # This module has external dependency on other module(s).
+    echo dbus systemd-sysusers
+    # Return 0 to include the dependent module(s) in the initramfs.
+    return 0
+
+}
+
+# Install the required file(s) and directories for the module in the initramfs.
+install() {
+
+    inst_simple "$moddir/resolved-tmpfile-dracut.conf" "$tmpfilesdir/resolved-tmpfile-dracut.conf"
+
+    inst_multiple -o \
+        "$dbussystem"/org.freedesktop.resolve1.conf \
+        "$dbussystemservices"/org.freedesktop.resolve1.service \
+        "$systemdutildir"/resolv.conf \
+        "$systemdutildir"/resolved.conf \
+        "$systemdutildir/resolved.conf.d/*.conf" \
+        "$systemdutildir"/systemd-resolved \
+        "$systemdsystemunitdir"/systemd-resolved.service \
+        "$systemdsystemunitdir/systemd-resolved.service.d/*.conf" \
+        "$sysusers"/systemd-resolve.conf \
+        resolvectl
+
+    # Enable systemd type unit(s)
+    $SYSTEMCTL -q --root "$initdir" enable systemd-resolved.service
+
+    # Install the hosts local user configurations if enabled.
+    if [[ $hostonly ]]; then
+        inst_multiple -H -o \
+            "$systemdutilconfdir"/resolved.conf \
+            "$systemdutilconfdir/resolved.conf.d/*.conf" \
+            "$systemdsystemconfdir"/systemd-resolved.service \
+            "$systemdsystemconfdir/systemd-resolved.service.d/*.conf" \
+            "$sysusersconfdir"/systemd-resolve.conf
+    fi
+}
diff --git a/modules.d/01systemd-resolved/resolved-tmpfile-dracut.conf b/modules.d/01systemd-resolved/resolved-tmpfile-dracut.conf
new file mode 100644
index 0000000..6b7daa9
--- /dev/null
+++ b/modules.d/01systemd-resolved/resolved-tmpfile-dracut.conf
@@ -0,0 +1,2 @@
+# This file is part of dracut systemd-resolved module.
+L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf