diff --git a/src/common/xfce/window_manager_startup.sh b/src/common/xfce/window_manager_startup.sh index 8901a7a..5101cb2 100644 --- a/src/common/xfce/window_manager_startup.sh +++ b/src/common/xfce/window_manager_startup.sh @@ -5,8 +5,8 @@ echo -e "\n------------------ Xfce4 window manager startup------------------" if [ "${START_XFCE4}" == "1" ] ; then - if [ -f /usr/bin/vglrun ] && [ -d /dev/dri ]; then - echo "Starting XFCE with VirtualGL" + if [ -f /usr/bin/vglrun ] && [ -d /dev/dri ] && [ -O /dev/dri/card0 ] && [ -O /dev/dri/renderD128 ] ; then + echo "Starting XFCE with VirtualGL" DISPLAY=:1 /usr/bin/vglrun -d /dev/dri/card0 /usr/bin/startxfce4 --replace & else echo "Starting XFCE" diff --git a/src/ubuntu/install/tools/install_tools.sh b/src/ubuntu/install/tools/install_tools.sh index 1c1a027..5ff80c5 100644 --- a/src/ubuntu/install/tools/install_tools.sh +++ b/src/ubuntu/install/tools/install_tools.sh @@ -20,12 +20,4 @@ if [ "$DISTRO" = "ubuntu" ]; then #update mesa to latest add-apt-repository ppa:kisak/kisak-mesa apt full-upgrade -y - - #install virtualgl - wget https://sourceforge.net/projects/virtualgl/files/2.6.90%20%283.0beta1%29/virtualgl_2.6.90_amd64.deb -P /tmp - set +e - dpkg -i /tmp/virtualgl_*amd64.deb - set -e - apt install -f -y - rm /tmp/virtualgl_*amd64.deb fi diff --git a/src/ubuntu/install/virtualgl/install_virtualgl.sh b/src/ubuntu/install/virtualgl/install_virtualgl.sh index 62ea534..a5c0f5a 100644 --- a/src/ubuntu/install/virtualgl/install_virtualgl.sh +++ b/src/ubuntu/install/virtualgl/install_virtualgl.sh @@ -4,10 +4,10 @@ if [ "$DISTRO" = "ubuntu" ]; then apt full-upgrade -y #install virtualgl - wget https://sourceforge.net/projects/virtualgl/files/2.6.95%20%283.0rc1%29/virtualgl_2.6.95_amd64.deb -P /tmp + #wget https://sourceforge.net/projects/virtualgl/files/2.6.95%20%283.0rc1%29/virtualgl_2.6.95_amd64.deb -P /tmp set +e - dpkg -i /tmp/virtualgl_*amd64.deb + dpkg -i $INST_SCRIPTS/virtualgl/virtualgl_*amd64.deb set -e apt install -f -y - rm /tmp/virtualgl_*amd64.deb + rm $INST_SCRIPTS/virtualgl/virtualgl_*amd64.deb fi diff --git a/src/ubuntu/install/virtualgl/virtualgl_3.0.80_amd64.deb b/src/ubuntu/install/virtualgl/virtualgl_3.0.80_amd64.deb new file mode 100644 index 0000000..627f7e9 Binary files /dev/null and b/src/ubuntu/install/virtualgl/virtualgl_3.0.80_amd64.deb differ