Merging upstream version 103.

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

1 files changed, 14 insertions, 5 deletions

diff --git a/modules.d/01systemd-networkd/module-setup.sh b/modules.d/01systemd-networkd/module-setup.sh
index 3658882..007590b 100755
--- a/modules.d/01systemd-networkd/module-setup.sh
+++ b/modules.d/01systemd-networkd/module-setup.sh
@@ -22,7 +22,7 @@ check() {
 depends() {
 
     # This module has external dependency on other module(s).
-    echo kernel-network-modules systemd-sysusers
+    echo kernel-network-modules systemd-sysusers systemd
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 
@@ -31,6 +31,8 @@ depends() {
 # Install the required file(s) and directories for the module in the initramfs.
 install() {
 
+    inst_sysusers systemd-network.conf
+
     inst_multiple -o \
         "$tmpfilesdir"/systemd-network.conf \
         "$dbussystem"/org.freedesktop.network1.conf \
@@ -55,8 +57,16 @@ install() {
         "$systemdsystemunitdir"/systemd-networkd-wait-online.service \
         "$systemdsystemunitdir"/systemd-networkd-wait-online@.service \
         "$systemdsystemunitdir"/systemd-network-generator.service \
-        "$sysusers"/systemd-network.conf \
-        ip
+        ip sed grep
+
+    inst_simple "$moddir"/99-wait-online-dracut.conf \
+        "$systemdsystemunitdir"/systemd-networkd-wait-online.service.d/99-dracut.conf
+
+    inst_simple "$moddir"/99-default.network \
+        "$systemdnetworkconfdir"/99-dracut-default.network
+
+    inst_hook cmdline 99 "$moddir"/networkd-config.sh
+    inst_hook initqueue/settled 99 "$moddir"/networkd-run.sh
 
     # Enable systemd type units
     for i in \
@@ -82,7 +92,6 @@ install() {
             "$systemdsystemconfdir"/systemd-networkd-wait-online.service \
             "$systemdsystemconfdir/systemd-networkd-wait-online.service.d/*.conf" \
             "$systemdsystemconfdir"/systemd-networkd-wait-online@.service \
-            "$systemdsystemconfdir/systemd-networkd-wait-online@.service.d/*.conf" \
-            "$sysusersconfdir"/systemd-network.conf
+            "$systemdsystemconfdir/systemd-networkd-wait-online@.service.d/*.conf"
     fi
 }