diff options
Diffstat (limited to 'scripts/runqemu-internal')
| -rwxr-xr-x | scripts/runqemu-internal | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 73b8b41ec4..92f245a112 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
| @@ -467,11 +467,15 @@ cat << EOM | |||
| 467 | WARNING: nVidia proprietary OpenGL libraries detected. | 467 | WARNING: nVidia proprietary OpenGL libraries detected. |
| 468 | nVidia's OpenGL libraries are known to have compatibility issues with qemu, | 468 | nVidia's OpenGL libraries are known to have compatibility issues with qemu, |
| 469 | resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL | 469 | resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL |
| 470 | libraries precede nvidia's via LD_PRELOAD(Already do it on Ubuntu). | 470 | libraries precede nvidia's via LD_PRELOAD(Already do it on Ubuntu 10). |
| 471 | EOM | 471 | EOM |
| 472 | 472 | ||
| 473 | # Automatically use Ubuntu system's mesa libGL, other distro can add its own path | 473 | # Automatically use Ubuntu system's mesa libGL, other distro can add its own path |
| 474 | if grep -i ubuntu /etc/lsb-release &> /dev/null | 474 | if grep -i ubuntu /etc/lsb-release &> /dev/null |
| 475 | then | ||
| 476 | # precede nvidia's driver on Ubuntu 10 | ||
| 477 | UBUNTU_MAIN_VERSION=`cat /etc/lsb-release |grep DISTRIB_RELEASE |cut -d= -f 2| cut -d. -f 1` | ||
| 478 | if [ $UBUNTU_MAIN_VERSION -eq 10 ]; | ||
| 475 | then | 479 | then |
| 476 | GL_PATH="" | 480 | GL_PATH="" |
| 477 | if test -e /usr/lib/libGL.so | 481 | if test -e /usr/lib/libGL.so |
| @@ -482,10 +486,11 @@ EOM | |||
| 482 | GL_PATH="/usr/lib/x86_64-linux-gnu/libGL.so" | 486 | GL_PATH="/usr/lib/x86_64-linux-gnu/libGL.so" |
| 483 | fi | 487 | fi |
| 484 | 488 | ||
| 485 | echo "Skip nVidia's libGL on Ubuntu!" | 489 | echo "Skip nVidia's libGL on Ubuntu 10!" |
| 486 | GL_LD_PRELOAD="$GL_PATH $LD_PRELOAD" | 490 | GL_LD_PRELOAD="$GL_PATH $LD_PRELOAD" |
| 487 | fi | 491 | fi |
| 488 | fi | 492 | fi |
| 493 | fi | ||
| 489 | 494 | ||
| 490 | echo "Running $QEMU..." | 495 | echo "Running $QEMU..." |
| 491 | # -no-reboot is a mandatory option - see bug #100 | 496 | # -no-reboot is a mandatory option - see bug #100 |
