VirtualBox

儲存庫 vbox 的更動 12490


忽略:
時間撮記:
2008-9-16 下午01:45:56 (16 年 以前)
作者:
vboxsync
訊息:

Additions/x11: hopefully fixed VBoxRandR.sh to run on Solaris

檔案:
修改 1 筆資料

圖例:

未更動
新增
刪除
  • trunk/src/VBox/Additions/x11/installer/VBoxRandR.sh

    r12482 r12490  
    3030#
    3131
     32xorgbin=Xorg
     33found=`which Xorg | grep "no Xorg"`
     34if test ! -z "$found"; then
     35    if test -f "/usr/X11/bin/Xorg"; then
     36        xorgbin=/usr/X11/bin/Xorg
     37    else
     38        exit 1
     39    fi
     40fi
     41
    3242randrbin=xrandr
    3343found=`which xrandr | grep "no xrandr"`
     
    5161
    5262# If we were called with the --test parameter, we check whether the display
    53 # we are running on is really using the VBox video driver (and RandR 1.2).
     63# we are running on is really using the VBox video driver (and RandR 1.2),
     64# and whether we are running on a buggy version of X.org which might crash
     65# when we resize.
    5466if test "$1" = "--test"; then
    55     # @otodo to be fixed properly
    56     osname=`uname -s`
    57     if test "$osname" = "SunOS"; then
    58         $randrbin 2> /dev/null | grep VBOX1 > /dev/null
    59         exit
    60     else
    61         xout=`X -version 2>&1`
    62         ! echo "$xout" | grep 1.4.99.901 > /dev/null &&
    63         ! echo "$xout" | grep 1.4.99.902 > /dev/null &&
    64         ! echo "$xout" | grep 1.4.99.903 > /dev/null &&
    65         ! echo "$xout" | grep 1.4.99.904 > /dev/null &&
    66         ! echo "$xout" | grep 1.4.99.905 > /dev/null &&
    67         $randrbin 2> /dev/null | grep VBOX1 > /dev/null
    68         exit
     67    xout=`$xorgbin -version 2>&1`
     68    if echo "$xout" | grep 1.4.99.901 > /dev/null; then
     69        exit 1
     70    elif echo "$xout" | grep 1.4.99.902 > /dev/null; then
     71        exit 1
     72    elif echo "$xout" | grep 1.4.99.903 > /dev/null; then
     73        exit 1
     74    elif echo "$xout" | grep 1.4.99.904 > /dev/null; then
     75        exit 1
     76    elif echo "$xout" | grep 1.4.99.905 > /dev/null; then
     77        exit 1
    6978    fi
     79    $randrbin 2> /dev/null | grep VBOX1 > /dev/null
     80    exit
    7081fi
    7182
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette