Changeset 7771 in vbox for trunk/src

Timestamp:

Apr 7, 2008 2:03:37 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29323

Message:

Solaris additions: Fixes for working under Indiana guests.

One pending issue is VBoxClient isn't getting auto-restarted like it
does on Nevada.

Location:

trunk/src/VBox/Additions/solaris

Files:

• Installer/postinstall.sh (modified) (3 diffs)
• Makefile.kmk (modified) (2 diffs)

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

@@ -59 +59 @@
 esac
 
+retval=0
 if test -z "$vboxmouse_src"; then
     echo "Unknown version of the X Window System installed."
     echo "Failed to install the VirtualBox X Window System drivers."
+    
+    # Exit as partially failed installation
+    retval=2
 else
     vboxmouse_dest="/usr/lib/X11/modules/input/vboxmouse_drv.so"
@@ -77 +81 @@
     rm -f $vboxadditions_path/vboxvideo_drv_*
     /usr/sbin/removef -f $PKGINST
+    
+    # Some distros like Indiana have no xorg.conf, deal with this
+    if ! (test -f '/etc/X11/xorg.conf' -o -f '/etc/X11/.xorg.conf'); then
+        mv -f $vboxadditions_path/solaris_xorg.conf /etc/X11/.xorg.conf
+    fi
+
+    echo "Configuring Xorg..."
+    $vboxadditions_path/x11config.pl
 fi
-
-echo "Configuring Xorg..."
-$vboxadditions_path/x11config.pl
 
 /usr/sbin/installf -f $PKGINST
@@ -91 +100 @@
 
 echo "Done."
+if test $retval -eq 0; then
+    echo "Please restart X Window System for activating the X11 guest additions."
+fi
+exit $retval
 

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

@@ -53 +53 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
+                $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
                 $(PATH_BIN)/additions/vboxguest \
                 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf \
@@ -81 +82 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient                    $(SOLARISINSTDIR)/1099.vboxclient
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl                         $(SOLARISINSTDIR)/x11config.pl
+        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf                    $(SOLARISINSTDIR)/solaris_xorg.conf
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf  $(SOLARISINSTDIR)/vboxguest.conf
         $(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest                                                    $(SOLARISINSTDIR)/vboxguest