diff options
author | Jonathan Bauer | 2019-08-12 14:01:46 +0200 |
---|---|---|
committer | Jonathan Bauer | 2019-08-12 14:01:46 +0200 |
commit | 74a59c2b1a4b23978ac9aad56540aec64cc3f3e0 (patch) | |
tree | ddccdb72eda8cb17964ce31c54797f6e5e966fd9 /core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons | |
parent | [kernel] make sure CONFIG_X86_MSR is set (diff) | |
download | mltk-74a59c2b1a4b23978ac9aad56540aec64cc3f3e0.tar.gz mltk-74a59c2b1a4b23978ac9aad56540aec64cc3f3e0.tar.xz mltk-74a59c2b1a4b23978ac9aad56540aec64cc3f3e0.zip |
[vmware-version-check] CPU support check helper
Diffstat (limited to 'core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons')
-rwxr-xr-x | core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons index 8c14b0d4..735c72c0 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons @@ -14,6 +14,8 @@ # ###################################################################################### +export PATH=$PATH:/opt/openslx/sbin:/opt/openslx/bin + # read global OpenSLX config . /opt/openslx/config || { echo "Could not source config!"; exit 23; } @@ -56,16 +58,8 @@ if [ $# -eq 1 ]; then # Select proper VMware version FILE="$ADDON" if [ "$ADDON" = "vmware" ]; then - vendor="$( awk '$1 == "vendor_id" {print $NF;exit}' /proc/cpuinfo )" - version=12 - if [ "$vendor" = "GenuineIntel" ]; then - modprobe msr - flag="$( rdmsr --bitfield 5:5 0x485 )" - [ "$flag" = 1 ] && version=15 - elif [ "$vendor" = "AuthenticAMD" ]; then - family="$( awk '$1$2 == "cpufamily" {print $NF;exit}' /proc/cpuinfo )" - [ "$family" -ge 21 ] && version=15 - fi + # check with the helper + version="$(vmware-get-supported-version)" FILE="vmware$version" echo "Deciding to download $FILE instead of $ADDON after checking CPU" fi |