vbox的更動 17698 路徑 trunk/src/VBox/Additions/solaris

時間撮記:

2009-3-11 下午03:02:54 (16 年 以前)

作者:

vboxsync

訊息:

Solaris/Additions: fix resizing issue with Xorg 1.3.x.

位置:

trunk/src/VBox/Additions/solaris

檔案:

• Installer/postinstall.sh (修改) (1 筆差異)
• Makefile.kmk (修改) (2 筆差異)

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -194 +194 @@
     # Some distros like Indiana have no xorg.conf, deal with this
     if test ! -f '/etc/X11/xorg.conf' && test ! -f '/etc/X11/.xorg.conf'; then
-        /usr/sbin/removef $PKGINST $vboxadditions_path/solarix_xorg.conf 1>/dev/null
-        mv -f $vboxadditions_path/solaris_xorg.conf /etc/X11/.xorg.conf
+
+        # Xorg 1.3.x+ should use the modeline less Xorg confs while older should
+        # use ones with all the video modelines in place. Argh.
+        xorgconf_file="solaris_xorg_modeless.conf"
+        xorgconf_unfit="solaris_xorg.conf"
+        case "$xorgversion" in
+            7.1.* | 7.2.* | 6.9.* | 7.0.* )
+                xorgconf_file="solaris_xorg.conf"
+                xorgconf_unfit="solaris_xorg_modeless.conf"
+                ;;
+        esac
+
+        /usr/sbin/removef $PKGINST $vboxadditions_path/$xorgconf_file 1>/dev/null
+        mv -f $vboxadditions_path/$xorgconf_file /etc/X11/.xorg.conf
+
+        /usr/sbin/removef $PKGINST $vboxadditions_path/$xorgconf_unfit 1>/dev/null
+        rm -f $vboxadditions_path/$xorgconf_unfit
     fi
 

trunk/src/VBox/Additions/solaris/Makefile.kmk

@@ -134 +134 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11restore.pl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
+                $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg_modeless.conf \
                 $(VBOX_SOLPACKFILES) \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh \
@@ -166 +167 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11restore.pl                        $(SOLARIS_ADD_INST_DIR)/x11restore.pl
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf                    $(SOLARIS_ADD_INST_DIR)/solaris_xorg.conf
+        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg_modeless.conf           $(SOLARIS_ADD_INST_DIR)/solaris_xorg_modeless.conf
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh                         $(SOLARIS_ADD_INST_DIR)/VBoxRandR.sh
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf  $(SOLARIS_ADD_INST_DIR)/vboxguest.conf