Changeset 7950 in vbox

Timestamp:

Apr 14, 2008 1:22:19 PM (17 years ago)

Author:

vboxsync

Message:

Solaris guest installer: VBoxClient now re/starts properly on Indiana.

Location:

trunk/src/VBox/Additions/solaris

Files:

• Installer/makepackage.sh (modified) (1 diff)
• Installer/postinstall.sh (modified) (3 diffs)
• Installer/vboxclient.desktop (added)
• Makefile.kmk (modified) (1 diff)

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

@@ -36 +36 @@
 
 # install the vboxclient daemon
-/usr/bin/awk 'NF == 6 && $3 == "opt/VirtualBoxAdditions/1099.vboxclient=1099.vboxclient" { $3 = "usr/dt/config/Xsession.d/1099.vboxclient=1099.vboxclient" } { print }' prototype > prototype2
+#/usr/bin/awk 'NF == 6 && $3 == "opt/VirtualBoxAdditions/1099.vboxclient=1099.vboxclient" { $3 = "usr/dt/config/Xsession.d/1099.vboxclient=1099.vboxclient" } { print }' prototype > prototype2
 
 #install the timesync daemon

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

@@ -62 +62 @@
 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."
+    echo "*** Unknown version of the X Window System installed."
+    echo "*** Failed to install the VirtualBox X Window System drivers."
     
     # Exit as partially failed installation
@@ -92 +92 @@
 fi
 
+
+# Setup our VBoxClient
+echo "Configuring client..."
+vboxclient_src=$vboxadditions_path
+vboxclient_dest="/usr/dt/config/Xsession.d"
+if test -d "$vboxclient_dest"; then
+    /usr/sbin/installf -c none $PKGINST "$vboxclient_dest/1099.vboxclient" f
+    cp "$vboxclient_src/1099.vboxclient" "$vboxclient_dest/1099.vboxclient"
+elif test -d "/usr/share/gnome/autostart"; then
+    vboxclient_dest="/usr/share/gnome/autostart"
+    /usr/sbin/installf -c none $PKGINST "$vboxclient_dest/vboxclient.desktop" f
+    cp "$vboxclient_src/vboxclient.desktop" "$vboxclient_dest/vboxclient.desktop"
+else
+    echo "*** Failed to configure client!! Couldn't find autostart directory."
+    retval=2
+fi
+
+
 # Remove redundant files
 /usr/sbin/removef $PKGINST $vboxadditions_path/etc/devlink.tab 1>/dev/null
@@ -99 +117 @@
 
 /usr/sbin/installf -f $PKGINST
+
 
 # Setup our VBoxService SMF service

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

@@ -84 +84 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxguest.sh                     $(SOLARISINSTDIR)/vboxguest.sh
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml                  $(SOLARISINSTDIR)/vboxservice.xml
+        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxclient.desktop               $(SOLARISINSTDIR)/vboxclient.desktop
         $(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