Attachment 1849023 Details for Bug 2037311 – Patch for systemd-resolved not started

[patch] Patch for systemd-resolved not started

dracut-resolved.patch (text/plain), 3.47 KB, created by Ian Dall on 2022-01-05 12:24:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Dall

Created: 2022-01-05 12:24:48 UTC

Size: 3.47 KB

patch

obsolete

>--- ./modules.d/98dracut-systemd/module-setup.sh.dist	2021-05-27 22:04:19.000000000 +0930
>+++ ./modules.d/98dracut-systemd/module-setup.sh	2022-01-05 20:33:53.489390828 +1030
>@@ -23,6 +23,7 @@
>     inst_simple "$moddir/emergency.service" "${systemdsystemunitdir}"/emergency.service
>     inst_simple "$moddir/dracut-emergency.service" "${systemdsystemunitdir}"/dracut-emergency.service
>     inst_simple "$moddir/emergency.service" "${systemdsystemunitdir}"/rescue.service
>+    inst_simple "$moddir/wants-systemd-resolved.conf" "${systemdsystemunitdir}/sysinit.target.d/wants-systemd-resolved.conf"
> 
>     ln_r "${systemdsystemunitdir}/initrd.target" "${systemdsystemunitdir}/default.target"
> 
>--- ./modules.d/98dracut-systemd/wants-systemd-resolved.conf.dist	2021-12-31 23:46:21.329597091 +1030
>+++ ./modules.d/98dracut-systemd/wants-systemd-resolved.conf	2022-01-02 23:47:57.596912463 +1030
>@@ -0,0 +1,4 @@
>+# systemd-resolved is normally wanted by multi-user.target
>+# but in initrd the target is the Initrd Default Target
>+[Unit]
>+Wants=systemd-resolved.service
>--- ./modules.d/01systemd-resolved/module-setup.sh.dist	2021-05-27 22:04:19.000000000 +0930
>+++ ./modules.d/01systemd-resolved/module-setup.sh	2022-01-05 20:33:52.806374492 +1030
>@@ -30,7 +30,9 @@
> install() {
> 
>     inst_simple "$moddir/resolved-tmpfile-dracut.conf" "$tmpfilesdir/resolved-tmpfile-dracut.conf"
>-
>+    inst_simple "$moddir/dracut-resolved-wait.service" "${systemdsystemunitdir}/dracut-resolved-wait.service"
>+    inst_hook pre-pivot 85 "$moddir/write-resolve.sh"
>+    
>     inst_multiple -o \
>         "$dbussystem"/org.freedesktop.resolve1.conf \
>         "$dbussystemservices"/org.freedesktop.resolve1.service \
>@@ -40,10 +42,12 @@
>         "$systemdutildir"/systemd-resolved \
>         "$systemdsystemunitdir"/systemd-resolved.service \
>         "$systemdsystemunitdir/systemd-resolved.service.d/*.conf" \
>-        resolvectl
>+        resolvectl \
>+	host			# Needed to check domain name resolution
> 
>     # Enable systemd type unit(s)
>     $SYSTEMCTL -q --root "$initdir" enable systemd-resolved.service
>+    $SYSTEMCTL -q --root "$initdir" enable dracut-resolved-wait.service
> 
>     # Install the hosts local user configurations if enabled.
>     if [[ $hostonly ]]; then
>--- ./modules.d/00systemd/module-setup.sh.dist	2021-05-27 22:04:19.000000000 +0930
>+++ ./modules.d/00systemd/module-setup.sh	2022-01-01 23:49:47.311338402 +1030
>@@ -201,6 +201,10 @@
>         grep '^adm:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
>         # we don't use systemd-networkd, but the user is in systemd.conf tmpfiles snippet
>         grep '^systemd-network:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
>+        grep '^systemd-resolve:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
>+        grep '^systemd-timesync:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
>+	grep '^dbus:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
>+	
>     } >> "$initdir/etc/passwd"
> 
>     {
>@@ -211,6 +215,10 @@
>         grep '^root:' "$dracutsysrootdir"/etc/group 2> /dev/null
>         # we don't use systemd-networkd, but the user is in systemd.conf tmpfiles snippet
>         grep '^systemd-network:' "$dracutsysrootdir"/etc/group 2> /dev/null
>+        grep '^systemd-resolve:' "$dracutsysrootdir"/etc/group 2> /dev/null
>+        grep '^systemd-timesync:' "$dracutsysrootdir"/etc/group 2> /dev/null
>+	grep '^systemd-hostname:' "$dracutsysrootdir"/etc/group 2> /dev/null
>+	grep '^dbus:' "$dracutsysrootdir"/etc/group 2> /dev/null
>     } >> "$initdir/etc/group"
> 
>     ln_r "$systemdutildir"/systemd "/init"

Actions: View | Diff

Attachments on bug 2037311: 1849022 | 1849023 | 1849130