Changeset 17698 in vbox for trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

Timestamp:

Mar 11, 2009 3:02:54 PM (16 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Additions/solaris/Installer/postinstall.sh (modified) (1 diff)

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