make qemu and qemu-net a default module in non-hostonly mode

diff --git a/modules.d/90qemu-net/module-setup.sh b/modules.d/90qemu-net/module-setup.sh
index 58f123392474f27a5444d93d0aa0916761474d1f..121e83dfa58811ab8fc2212b8cfcee665777e810 100755 (executable)
--- a/modules.d/90qemu-net/module-setup.sh
+++ b/modules.d/90qemu-net/module-setup.sh
@@ -2,22 +2,25 @@
 
 # called by dracut
 check() {
-    if type -P systemd-detect-virt >/dev/null 2>&1; then
-        vm=$(systemd-detect-virt --vm >/dev/null 2>&1)
-        (($? != 0)) && return 255
-        [[ $vm = "qemu" ]] && return 0
-        [[ $vm = "kvm" ]] && return 0
-        [[ $vm = "bochs" ]] && return 0
-    fi
+    if [[ $hostonly ]] || [[ $mount_needs ]]; then
+        if type -P systemd-detect-virt >/dev/null 2>&1; then
+            vm=$(systemd-detect-virt --vm >/dev/null 2>&1)
+            (($? != 0)) && return 255
+            [[ $vm = "qemu" ]] && return 0
+            [[ $vm = "kvm" ]] && return 0
+            [[ $vm = "bochs" ]] && return 0
+        fi
 
-    for i in /sys/class/dmi/id/*_vendor; do
-        [[ -f $i ]] || continue
-        read vendor < $i
-        [[  "$vendor" == "QEMU" ]] && return 0
-        [[  "$vendor" == "Bochs" ]] && return 0
-    done
+        for i in /sys/class/dmi/id/*_vendor; do
+            [[ -f $i ]] || continue
+            read vendor < $i
+            [[  "$vendor" == "QEMU" ]] && return 0
+            [[  "$vendor" == "Bochs" ]] && return 0
+        done
 
-    return 255
+        return 255
+    fi
+    return 0
 }
 
 # called by dracut

diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh
index 9f8495a69448264392c53c79d1d3b6dfd8886557..7e5ea6a40a75c2efa36fc424ad707b354034b78b 100755 (executable)
--- a/modules.d/90qemu/module-setup.sh
+++ b/modules.d/90qemu/module-setup.sh
@@ -2,28 +2,33 @@
 
 # called by dracut
 check() {
-    if type -P systemd-detect-virt >/dev/null 2>&1; then
-        vm=$(systemd-detect-virt --vm 2>/dev/null)
-        (($? != 0)) && return 255
-        [[ $vm = "qemu" ]] && return 0
-        [[ $vm = "kvm" ]] && return 0
-        [[ $vm = "bochs" ]] && return 0
+    if [[ $hostonly ]] || [[ $mount_needs ]]; then
+        if type -P systemd-detect-virt >/dev/null 2>&1; then
+            vm=$(systemd-detect-virt --vm 2>/dev/null)
+            (($? != 0)) && return 255
+            [[ $vm = "qemu" ]] && return 0
+            [[ $vm = "kvm" ]] && return 0
+            [[ $vm = "bochs" ]] && return 0
+        fi
+
+        for i in /sys/class/dmi/id/*_vendor; do
+            [[ -f $i ]] || continue
+            read vendor < $i
+            [[ "$vendor" == "QEMU" ]] && return 0
+            [[ "$vendor" == "Red Hat" ]] && return 0
+            [[ "$vendor" == "Bochs" ]] && return 0
+        done
+
+        return 255
     fi
 
-    for i in /sys/class/dmi/id/*_vendor; do
-        [[ -f $i ]] || continue
-        read vendor < $i
-        [[ "$vendor" == "QEMU" ]] && return 0
-        [[ "$vendor" == "Red Hat" ]] && return 0
-        [[ "$vendor" == "Bochs" ]] && return 0
-    done
-    return 255
+    return 0
 }
 
 # called by dracut
 installkernel() {
-        # qemu specific modules
-        hostonly='' instmods \
+    # qemu specific modules
+    hostonly='' instmods \
             ata_piix ata_generic pata_acpi cdrom sr_mod ahci \
             virtio_blk virtio virtio_ring virtio_pci \
             virtio_scsi virtio_console virtio_rng \