fix(network): handle network selection properly

Earlier each test CI container included dhclient, which
meant that each CI continer supported network-legacy.

4ce57a5ad exposed a bug in the network selection as
network-manager was not selected even when available.

This change is fixes the following issues on the CI:
 - selects network-manager over network-legacy on Void
 - selects network-manager or systemd-networkd if network-legacy is not installed

Revert c81c955.

Adjust the CI to test with default networking instead of
forcing network-manager to test for this condition.

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 7a14f2e8eb8a96453a6b1f22d51a6b4da3209e98..88c70bb2a2ced8b7dcd2b5edaede10892f480085 100644 (file)
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -174,8 +174,6 @@ jobs:
                     - fedora:latest
                     - opensuse:latest
                     - ubuntu:devel
-                network:
-                    - network-manager
                 test:
                     - "60"
         container:
@@ -198,6 +196,7 @@ jobs:
             fail-fast: false
             matrix:
                 container:
+                    - arch:latest
                     - opensuse:latest
                 test:
                     - "70"

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 54fc65be459651e00ce246ee88bb5258a08fff9b..4293005e675d11124c7177a92f49e01d9151cb2b 100755 (executable)
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -19,7 +19,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\ * ]] && check_module "$module"; then
+        if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $module\ * ]]; then
             echo "$module"
             return 0
         fi