Changeset 12358 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 10, 2008 2:48:52 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11: deactivate dynamic resizing on guests with buggy release candidates of X.org 1.5.0 (i.e. Fedora 9), don't call X -version five times

File:

• trunk/src/VBox/Additions/x11/installer/VBoxRandR.sh (modified) (1 diff)

trunk/src/VBox/Additions/x11/installer/VBoxRandR.sh

@@ -43 +43 @@
 # we are running on is really using the VBox video driver (and RandR 1.2).
 if test "$1" = "--test"; then
-  ! X -version 2>&1 | grep 1.4.99.901 > /dev/null &&
-  ! X -version 2>&1 | grep 1.4.99.902 > /dev/null &&
-  ! X -version 2>&1 | grep 1.4.99.903 > /dev/null &&
-  ! X -version 2>&1 | grep 1.4.99.904 > /dev/null &&
-  ! X -version 2>&1 | grep 1.4.99.905 > /dev/null &&
+  xout=`X -version 2>&1`
+  ! echo $xout | grep 1.4.99.901 > /dev/null &&
+  ! echo $xout | grep 1.4.99.902 > /dev/null &&
+  ! echo $xout | grep 1.4.99.903 > /dev/null &&
+  ! echo $xout | grep 1.4.99.904 > /dev/null &&
+  ! echo $xout | grep 1.4.99.905 > /dev/null &&
   $randrbin 2> /dev/null | grep VBOX1 > /dev/null
   exit