feat(net-lib): add a new dracut module called net-lib

dracutdevs · Oct 28, 2023 · f6b62f9 · f6b62f9
1 parent b2af8c8
commit f6b62f9
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 114 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -290,3 +290,6 @@ test:
   - test/**/*
   - modules.d/80test*
   - modules.d/80test*/*
+
+net-lib:
+  - modules.d/45net-lib/*
diff --git a/modules.d/35connman/module-setup.sh b/modules.d/35connman/module-setup.sh
@@ -10,7 +10,7 @@ check() {
 
 # called by dracut
 depends() {
-    echo dbus systemd bash
+    echo dbus systemd bash net-lib
     return 0
 }
 
@@ -25,7 +25,6 @@ install() {
     # in an emergency shell.
     inst_multiple ip sed grep
 
-    inst_script "$moddir/netroot.sh" "/sbin/netroot"
     inst connmand
     inst connmanctl
     inst connmand-wait-online

diff --git a/modules.d/35network-legacy/module-setup.sh b/modules.d/35network-legacy/module-setup.sh
@@ -10,6 +10,7 @@ check() {
 
 # called by dracut
 depends() {
+    echo net-lib
     return 0
 }
 

diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
@@ -10,7 +10,7 @@ check() {
 
 # called by dracut
 depends() {
-    echo dbus bash
+    echo dbus bash net-lib
     return 0
 }
 

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
@@ -27,22 +27,6 @@ depends() {
             network_handler="network-legacy"
         fi
     fi
-    echo "kernel-network-modules $network_handler"
+    echo "net-lib kernel-network-modules $network_handler"
     return 0
 }
-
-# called by dracut
-installkernel() {
-    return 0
-}
-
-# called by dracut
-install() {
-    inst_script "$moddir/netroot.sh" "/sbin/netroot"
-    inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh"
-    inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
-    inst_hook cmdline 91 "$moddir/dhcp-root.sh"
-    inst_multiple ip sed awk grep pgrep tr
-    inst_multiple -o arping arping2
-    dracut_need_initqueue
-}
diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh
diff --git a/modules.d/40network/dhcp-root.sh → modules.d/45net-lib/dhcp-root.sh b/modules.d/40network/dhcp-root.sh → modules.d/45net-lib/dhcp-root.sh
diff --git a/modules.d/40network/ifname-genrules.sh → modules.d/45net-lib/ifname-genrules.sh b/modules.d/40network/ifname-genrules.sh → modules.d/45net-lib/ifname-genrules.sh
diff --git a/modules.d/45net-lib/module-setup.sh b/modules.d/45net-lib/module-setup.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+check() {
+    return 255
+}
+
+depends() {
+    echo base
+    return 0
+}
+
+install() {
+    inst_script "$moddir/netroot.sh" "/sbin/netroot"
+    inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh"
+    inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
+    inst_hook cmdline 91 "$moddir/dhcp-root.sh"
+    inst_multiple ip sed awk grep pgrep tr
+    inst_multiple -o arping arping2
+    dracut_need_initqueue
+}
diff --git a/modules.d/40network/net-lib.sh → modules.d/45net-lib/net-lib.sh b/modules.d/40network/net-lib.sh → modules.d/45net-lib/net-lib.sh
diff --git a/modules.d/35connman/netroot.sh → modules.d/45net-lib/netroot.sh b/modules.d/35connman/netroot.sh → modules.d/45net-lib/netroot.sh
diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
-. /lib/net-lib.sh
+type get_ip > /dev/null 2>&1 || . /lib/net-lib.sh
 
 # TODO: make these things not pollute the calling namespace
 

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
@@ -318,7 +318,7 @@ test_setup() {
         inst_simple "${PKGLIBDIR}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
         inst_simple "${PKGLIBDIR}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
         inst_simple "${PKGLIBDIR}/modules.d/45url-lib/url-lib.sh" "/lib/url-lib.sh"
-        inst_simple "${PKGLIBDIR}/modules.d/40network/net-lib.sh" "/lib/net-lib.sh"
+        inst_simple "${PKGLIBDIR}/modules.d/45net-lib/net-lib.sh" "/lib/net-lib.sh"
         inst_simple "${PKGLIBDIR}/modules.d/95nfs/nfs-lib.sh" "/lib/nfs-lib.sh"
         inst_binary "${PKGLIBDIR}/dracut-util" "/usr/bin/dracut-util"
         ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"