]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
feat(systemd-resolved): introducing the systemd-resolved module
authorJóhann B. Guðmundsson <johannbg@gmail.com>
Fri, 16 Apr 2021 22:24:57 +0000 (22:24 +0000)
committerHarald Hoyer <harald@hoyer.xyz>
Thu, 22 Apr 2021 08:48:56 +0000 (10:48 +0200)
Introducing the systemd-resolved module

dracut.spec
modules.d/01systemd-resolved/module-setup.sh [new file with mode: 0755]
modules.d/01systemd-resolved/resolved-tmpfile-dracut.conf [new file with mode: 0644]

index e80253a610a0466acf01b283abf3b2a7289f259a..07e767ce6dd990352a1708f5e941251c8dd7ce85 100644 (file)
@@ -329,6 +329,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{dracutlibdir}/modules.d/01systemd-initrd
 %{dracutlibdir}/modules.d/01systemd-modules-load
 %{dracutlibdir}/modules.d/01systemd-repart
+%{dracutlibdir}/modules.d/01systemd-resolved
 %{dracutlibdir}/modules.d/01systemd-sysctl
 %{dracutlibdir}/modules.d/01systemd-sysusers
 %{dracutlibdir}/modules.d/01systemd-timesyncd
diff --git a/modules.d/01systemd-resolved/module-setup.sh b/modules.d/01systemd-resolved/module-setup.sh
new file mode 100755 (executable)
index 0000000..9fd1dc1
--- /dev/null
@@ -0,0 +1,62 @@
+#!/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 || return 1
+    require_binaries "$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" \
+        resolvectl
+
+    # Enable systemd type unit(s)
+    $SYSTEMCTL -q --root "$initdir" enable systemd-resolved.service
+
+    # Install library file(s)
+    _arch=${DRACUT_ARCH:-$(uname -m)}
+    inst_libdir_file \
+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_myhostname.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_resolve.so.*"
+
+    # 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/*.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 (file)
index 0000000..6b7daa9
--- /dev/null
@@ -0,0 +1,2 @@
+# This file is part of dracut systemd-resolved module.
+L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf