diff options
| author | Simon Rettberg | 2019-04-26 11:24:14 +0200 |
|---|---|---|
| committer | root | 2019-04-26 11:24:14 +0200 |
| commit | 24fb4ad142f7cb932a5e47ee80c9bbfc10a758c0 (patch) | |
| tree | 5873fcbd617e6ea13f1c1bdc6145211441fbf764 /core/rootfs/rootfs-stage32/data | |
| parent | Support multi-target targets with @ syntax (diff) | |
| download | mltk-24fb4ad142f7cb932a5e47ee80c9bbfc10a758c0.tar.gz mltk-24fb4ad142f7cb932a5e47ee80c9bbfc10a758c0.tar.xz mltk-24fb4ad142f7cb932a5e47ee80c9bbfc10a758c0.zip | |
[nvidia*/rfs-s31] Support shipping multiple driver versions
Diffstat (limited to 'core/rootfs/rootfs-stage32/data')
| -rwxr-xr-x | core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver index b80bede7..2d113638 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver @@ -1,20 +1,13 @@ #!/bin/bash -PCIFILE=/tmp/lspci-output - -if ! lspci -n > "$PCIFILE"; then - echo "lspci -n failed..." - exit 1 -fi - if lsmod | grep -q '^nvidia\s'; then # nvidia kernel module was loaded in stage31 - download libs - echo "Proprietary nvidia kernel drivers loaded - fetch user space libs" - systemctl start setup-slx-addon@nvidia_libs & - #echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" -elif grep -q -E ' (8086:0102|8086:0152|8086:0162|8086:0412|8086:0416|8086:041e|8086:0a16|8086:1626|8086:1912|8086:3e92|8086:5912|1002:6779|1002:68f9)( |$)' "$PCIFILE"; then - echo "i915 - enable 3D" - #echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" + version=$( cat /sys/module/nvidia/version ) + if [ -n "$version" ]; then + echo "Proprietary nvidia kernel drivers v$version loaded - fetch user space libs" + /opt/openslx/scripts/systemd-download_slx_addons "nvidia-libs@$version" + /opt/openslx/scripts/systemd-setup_slx_addons "nvidia-libs@$version" || exit 1 + fi fi # Seems we can finally always do that; in fact, not doing so seems to crash VMs left and right |