fix(qemu-net): align check logic between qemu modules

diff --git a/modules.d/90kernel-network-modules/module-setup.sh b/modules.d/90kernel-network-modules/module-setup.sh
index ef5ed48217e04bfc3d8ea5da6f1926abdcd504d1..04d001bfa67f574644f07daa7f42c26d969c3495 100755 (executable)
--- a/modules.d/90kernel-network-modules/module-setup.sh
+++ b/modules.d/90kernel-network-modules/module-setup.sh
@@ -5,11 +5,6 @@ check() {
     return 255
 }
 
-# called by dracut
-depends() {
-    is_qemu_virtualized && echo -n "qemu-net "
-}
-
 # called by dracut
 installkernel() {
     # Include wired net drivers, excluding wireless

diff --git a/modules.d/90qemu-net/module-setup.sh b/modules.d/90qemu-net/module-setup.sh
index 0fa49aa8020c3aab42b2a60a1f6f5d389fa30c7f..bf64ad9ca5cabd43e10d15a247eb906c5d54cee0 100755 (executable)
--- a/modules.d/90qemu-net/module-setup.sh
+++ b/modules.d/90qemu-net/module-setup.sh
@@ -2,12 +2,9 @@
 
 # called by dracut
 check() {
-    if [[ $hostonly ]]; then
-        return 255
-    fi
+    is_qemu_virtualized && return 0
 
-    if [[ $mount_needs ]]; then
-        is_qemu_virtualized && return 0
+    if [[ $hostonly ]] || [[ $mount_needs ]]; then
         return 255
     fi
 

diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh
index 9e8c3a53d4d6f6cd9417aca6dca9233684182f3b..06f4dcbbfafc6a91fefa4df6ec68a521892f61fa 100755 (executable)
--- a/modules.d/90qemu/module-setup.sh
+++ b/modules.d/90qemu/module-setup.sh
@@ -2,8 +2,9 @@
 
 # called by dracut
 check() {
+    is_qemu_virtualized && return 0
+
     if [[ $hostonly ]] || [[ $mount_needs ]]; then
-        is_qemu_virtualized && return 0
         return 255
     fi