From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Fri, 20 Sep 2024 03:10:48 +0000 (-0400)
Subject: fix(network): call both check_module and module_check
X-Git-Tag: 104~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c81c955;p=thirdparty%2Fdracut-ng.git

fix(network): call both check_module and module_check

Add back testing the module with check_module as well as module_check.

Without this PR, on some Linux distributions (e.g. Void) adding `network` meta module
no longer works as it tries and fails to install the preferred netowrking backend
(network-manager).
---

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index c8ba54402..65c1b6605 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -21,7 +21,7 @@ depends() {
     for module in network-manager systemd-networkd connman; do
         # install the first viable module, unless there omitted
         module_check $module > /dev/null 2>&1
-        if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $module\ * ]]; then
+        if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $module\ * ]] && check_module "$module"; then
             echo "$module"
             return 0
         fi