From bb7425b8102f46928327bc762f653b2660643c34 Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Fri, 1 Nov 2024 11:32:11 -0400 Subject: [PATCH] fix(qemu-net): align check logic between qemu modules --- modules.d/90kernel-network-modules/module-setup.sh | 5 ----- modules.d/90qemu-net/module-setup.sh | 7 ++----- modules.d/90qemu/module-setup.sh | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/modules.d/90kernel-network-modules/module-setup.sh b/modules.d/90kernel-network-modules/module-setup.sh index ef5ed4821..04d001bfa 100755 --- 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 0fa49aa80..bf64ad9ca 100755 --- 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 9e8c3a53d..06f4dcbbf 100755 --- 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 -- 2.47.3