]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
90qemu: fixed systemd-detect-virt output parsing
authorHarald Hoyer <harald@redhat.com>
Fri, 31 Jul 2015 07:05:51 +0000 (09:05 +0200)
committerHarald Hoyer <harald@redhat.com>
Fri, 9 Oct 2015 09:06:50 +0000 (11:06 +0200)
redirecting systemd-detect-virt to /dev/null doesn't help with parsing
the output :-/

Also, add "Red Hat" as a vendor.

(cherry picked from commit 4135eea634b20c7f7285d134bd6dfe6b799fe226)

modules.d/90qemu/module-setup.sh

index 64eac9ed37bc788004f8dda6a73052207b1c3bba..46b7ae21277be335a81c4bebd63583ba6808aac5 100755 (executable)
@@ -4,7 +4,7 @@
 
 check() {
     if type -P systemd-detect-virt >/dev/null 2>&1; then
-        vm=$(systemd-detect-virt --vm >/dev/null 2>&1)
+        vm=$(systemd-detect-virt --vm 2>/dev/null)
         (($? != 0)) && return 255
         [[ $vm = "qemu" ]] && return 0
         [[ $vm = "kvm" ]] && return 0
@@ -14,8 +14,9 @@ check() {
     for i in /sys/class/dmi/id/*_vendor; do
         [[ -f $i ]] || continue
         read vendor < $i
-        [[  "$vendor" == "QEMU" ]] && return 0
-        [[  "$vendor" == "Bochs" ]] && return 0
+        [[ "$vendor" == "QEMU" ]] && return 0
+        [[ "$vendor" == "Red Hat" ]] && return 0
+        [[ "$vendor" == "Bochs" ]] && return 0
     done
     return 255
 }