Changeset 59005 in vbox

Timestamp:

Dec 5, 2015 9:51:38 AM (9 years ago)

Author:

vboxsync

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

104533

Message:

bugref:8153: vboxvideo: ABI issues / software rendering on Linux guests: second attempt at installing our 3D library at Additions start-time. I had assumed that vboxguest.sh was executed automatically. This seems not to be the case, so add a new system service to execute it with the start 3D option.

Location:

trunk/src/VBox/Additions/solaris

Files:

• Installer/makepackage.sh (modified) (1 diff)
• Installer/postinstall.sh (modified) (4 diffs)
• Installer/vboxsetup3d.xml (copied) (copied from trunk/src/VBox/Additions/solaris/Installer/vboxservice.xml ) (4 diffs)
• Makefile.kmk (modified) (5 diffs)

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

@@ -117 +117 @@
 filelist_fixup prototype '$3 == "var/svc/manifest/application/virtualbox/vboxservice.xml"'                   '$2 = "manifest";$6 = "sys"'
 filelist_fixup prototype '$3 == "var/svc/manifest/application/virtualbox/vboxmslnk.xml"'                     '$2 = "manifest";$6 = "sys"'
+filelist_fixup prototype '$3 == "var/svc/manifest/application/virtualbox/vboxsetup3d.xml"'                   '$2 = "manifest";$6 = "sys"'
 
 # vboxguest

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

@@ -345 +345 @@
     /usr/sbin/devfsadm -i vboxguest
 
-    # Setup VBoxService and vboxmslnk and start the services automatically
+    # Setup VBoxService, vboxmslnk and vboxsetup3d and start the services automatically
     echo "Configuring services (this might take a while)..."
     cmax=32
@@ -356 +356 @@
     # 1 second intervals to see if our service has been successfully imported and timeout after 'cmax' seconds.
     /usr/sbin/svcadm restart svc:system/manifest-import:default
-    /usr/bin/svcs virtualbox/vboxservice virtualbox/vboxmslnk >/dev/null 2>&1
+    /usr/bin/svcs virtualbox/vboxservice virtualbox/vboxmslnk virtualbox/vboxsetup3d >/dev/null 2>&1
     while test "$?" -ne 0;
     do
@@ -365 +365 @@
             break
         fi
-        /usr/bin/svcs virtualbox/vboxservice virtualbox/vboxmslnk >/dev/null 2>&1
+        /usr/bin/svcs virtualbox/vboxservice virtualbox/vboxmslnk virtualbox/vboxsetup3d >/dev/null 2>&1
     done
     if test "$success" -eq 0; then
@@ -371 +371 @@
         /usr/sbin/svcadm enable -s virtualbox/vboxservice
         /usr/sbin/svcadm enable -s virtualbox/vboxmslnk
+        /usr/sbin/svcadm enable -s virtualbox/vboxsetup3d
     else
         echo "## Service import failed."

trunk/src/VBox/Additions/solaris/Installer/vboxsetup3d.xml

@@ -2 +2 @@
 <!--
 #
-# Solaris SMF service manifest for VBoxService (timesync).
+# Solaris SMF service manifest for setting up 3D pass-through.
 #
-    Copyright (C) 2008-2012 Oracle Corporation
+    Copyright (C) 2008-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<service_bundle type='manifest' name='SUNWvboxguest:vboxservice'>
+<service_bundle type='manifest' name='SUNWvboxguest:vboxsetup3d'>
 
 <service
-    name='application/virtualbox/vboxservice'
+    name='application/virtualbox/vboxsetup3d'
     type='service'
     version='1'>
@@ -57 +57 @@
         type='method'
         name='start'
-        exec='/usr/bin/VBoxService'
+        exec='/usr/sbin/vboxguest.sh 3dstart'
         timeout_seconds='30' />
 
@@ -63 +63 @@
         type='method'
         name='stop'
-        exec=':kill'
+        exec='/usr/sbin/vboxguest.sh 3dstop'
         timeout_seconds='60' />
+
+    <property_group name='startd' type='framework'>
+        <propval name='duration' type='astring' value='transient' />
+    </property_group>
 
     <template>
         <common_name>
-            <loctext xml:lang='C'>VirtualBox Service.</loctext>
+            <loctext xml:lang='C'>VirtualBox 3D pass-through set-up.</loctext>
         </common_name>
     </template>

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

@@ -131 +131 @@
         $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml \
         $(PATH_ROOT)/src/VBox/Additions/solaris/Mouse/vboxmslnk.xml \
+        $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxsetup3d.xml \
         $(VBOX_BRAND_LICENSE_TXT)=>LICENSE
 
@@ -216 +217 @@
 
 SOLARIS_ADD_USRSBIN_LINKS = \
-        vboxmslnk
+        vboxmslnk \
+        vboxguest.sh
 
 SOLARIS_ADD_COMMON = \
@@ -226 +228 @@
 SOLARIS_ADD_SERVICES = \
         vboxservice.xml \
-        vboxmslnk.xml
+        vboxmslnk.xml \
+        vboxsetup3d.xml
 
 ifdef VBOX_COMPRESS
@@ -281 +284 @@
                 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml \
                 $(PATH_ROOT)/src/VBox/Additions/solaris/Mouse/vboxmslnk.xml \
+                $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxsetup3d.xml \
                 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient \
@@ -326 +330 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml                    $(SOLARIS_ADD_SERVICESINST_DIR)/vboxservice.xml
         $(QUIET)$(INSTALL) -m 0644      $(PATH_ROOT)/src/VBox/Additions/solaris/Mouse/vboxmslnk.xml                      $(SOLARIS_ADD_SERVICESINST_DIR)/vboxmslnk.xml
+        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxsetup3d.xml                    $(SOLARIS_ADD_SERVICESINST_DIR)/vboxsetup3d.xml
         $(QUIET)$(SOLARIS_ADDINST_OUT_DIR)/makepackage.sh $(SOLARIS_ADDINST_OUT_DIR) $(PKGFILENAME) $(VBOX_SVN_REV) $(VBOX_SOL_PKG_DEV)
         $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) $(PATH_STAGE_BIN)/additions/$(PKGFILENAME)