From 8782f1eea7386510679a0dc2d1cfda44a67a1a04 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 22 Sep 2017 12:44:10 +0200
Subject: [dnbd3-rootfs] add systemd-networkd support

module will now pull 'systemd-networkd-ext' if systemd-inird module is
to be built, or the old 'network' module for the old sysvinit.
---
 builder/modules.d/dnbd3-rootfs/module-setup.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'builder/modules.d')

diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh
index 549900ad..4089ad24 100755
--- a/builder/modules.d/dnbd3-rootfs/module-setup.sh
+++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh
@@ -150,7 +150,9 @@ depends() {
     +doc_test_contains
     base
     '
-    echo base network bash kernel-modules shutdown
+    local network_module="network"
+    dracut_module_included "systemd-initrd" && network_module="systemd-networkd-ext"
+    echo base bash kernel-modules shutdown "$network_module"
 }
 installkernel() {
     local __doc__='
@@ -195,8 +197,9 @@ install() {
     # region hooks
     inst_hook cmdline 00 "$moddir/hooks/enable-sysrq.sh"
     # NOTE: Can be used to support old style ip append syntax and have an
-    # exclusive interface name.
-    inst_hook cmdline 10 \
+    # exclusive interface name - required when using dracut's regular
+    # 'network' module
+    dracut_module_included "network" && inst_hook cmdline 10 \
         "$moddir/hooks/prepare-kernel-command-line-parameter.sh"
     inst_hook cmdline 90 "$moddir/hooks/set-dracut-environment-variables.sh"
     inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh"
-- 
cgit v1.2.3-55-g7522