[vmware-version-check] don't look...

1 files changed, 11 insertions, 4 deletions

diff --git a/core/modules/vmware-version-check/data/opt/openslx/bin/vmware-get-supported-version b/core/modules/vmware-version-check/data/opt/openslx/bin/vmware-get-supported-version
index 82bd7d50..12767e23 100755
--- a/core/modules/vmware-version-check/data/opt/openslx/bin/vmware-get-supported-version
+++ b/core/modules/vmware-version-check/data/opt/openslx/bin/vmware-get-supported-version
@@ -2,15 +2,22 @@
 # This script checks whether given VMware version supports the CPU:
 # * Intel: check for "VMX Unrestricted Guest" CPU flag
 # * AMD:   check if CPU family is Bulldozer or newer
-
-export PATH=$PATH:/opt/openslx/sbin:/opt/openslx/bin
+#
+# It can be called inside a dracut context and tries to do
+# chroot magic to call/load the required tools.
 
 get_supported_version() {
 	local vendor="$( awk '$1 == "vendor_id" {print $NF;exit}' /proc/cpuinfo )"
 	local version=12
 	if [ "$vendor" = "GenuineIntel" ]; then
-		modprobe msr
-		flag="$( rdmsr --bitfield 5:5 0x485 )"
+		local rdmsr_cmd="rdmsr"
+		if [ -n "$NEWROOT" ]; then
+			modprobe -d "$NEWROOT" msr
+			rdmsr_cmd="${NEWROOT}/$(chroot $NEWROOT /bin/bash -c 'type -p rdmsr')"
+		else
+			modprobe msr
+		fi
+		flag="$( $rdmsr_cmd --bitfield 5:5 0x485 )"
 		[ "$flag" = 1 ] && version=15
 	elif [ "$vendor" = "AuthenticAMD" ]; then
 		family="$( awk '$1$2 == "cpufamily" {print $NF;exit}' /proc/cpuinfo )"