Changeset 13231 in vbox for trunk/src

Timestamp:

Oct 13, 2008 7:04:13 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/Installer: SMF for S10 zone access.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• postinstall.sh (modified) (3 diffs)
• preremove.sh (modified) (1 diff)
• virtualbox-zoneaccess.xml (added)
• zoneaccess.sh (added)

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

@@ -151 +151 @@
         $(if $(not $(VBOX_WITH_NETFLT))vnic_term.sh,) \
         virtualbox-webservice.xml \
+        virtualbox-zoneaccess.xml \
+        zoneaccess.sh \
         smf-vboxwebsrv.sh \
         vbox.copyright \
@@ -380 +382 @@
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox-webservice.xml         $(SOLARIS_INST_DIR)/virtualbox-webservice.xml,)
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/smf-vboxwebsrv.sh                 $(SOLARIS_INST_DIR)/smf-vboxwebsrv.sh,)
+        $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox-zoneaccess.xml         $(SOLARIS_INST_DIR)/virtualbox-zoneaccess.xml,)
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/zoneaccess.sh                                      $(SOLARIS_INST_DIR)/zoneaccess.sh
         $(QUIET)$(if $(not $(VBOX_WITH_NETFLT))$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh            $(SOLARIS_INST_DIR)/vnic_setup.sh,)
         $(QUIET)$(if $(not $(VBOX_WITH_NETFLT))$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh            $(SOLARIS_INST_DIR)/vnic_term.sh,)

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

@@ -23 +23 @@
 # Check for xVM/Xen
 currentisa=`uname -i`
+osrevision=`uname -r`
 if test "$currentisa" = "i86xpv"; then
     echo "## VirtualBox cannot run under xVM Dom0! Fatal Error, Aborting installation!"
@@ -61 +62 @@
 
 if test "$currentzone" = "global"; then
+    # Web service
     if test -f /var/svc/manifest/application/virtualbox/webservice.xml; then
         /usr/sbin/svccfg import /var/svc/manifest/application/virtualbox/webservice.xml
@@ -79 +81 @@
         touch /usr/share/applications/virtualbox.desktop
     fi
+
+    # Zone access service only necessary for Solaris 10
+    if test "$osrevision" = "5.10"; then
+        /usr/sbin/installf -c none $PKGINST /var/svc/manifest/application/virtualbox/zoneaccess.xml f
+        cp /opt/VirtualBox/virtualbox-zoneaccess.xml /var/svc/manifest/application/virtualbox/zoneaccess.xml
+
+        /usr/sbin/svccfg import /var/svc/manifest/application/virtualbox/zoneaccess.xml
+        /usr/sbin/svcadm enable -s svc:/application/virtualbox/zoneaccess
+    else
+        /usr/sbin/removef $PKGINST /opt/VirtualBox/zoneaccess.sh 1>/dev/null 2>/dev/null
+        rm -f /opt/VirtualBox/zoneaccess.sh
+    fi
+
+    /usr/sbin/removef $PKGINST /opt/VirtualBox/virtualbox-zoneaccess.xml 1>/dev/null 2>/dev/null
+    rm -f /opt/VirtualBox/virtualbox-zoneaccess.xml
 fi
 
+/usr/sbin/removef -f $PKGINST
 /usr/sbin/installf -f $PKGINST
 

trunk/src/VBox/Installer/solaris/preremove.sh

@@ -23 +23 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    # stop and unregister webservice daemon
+    # stop and unregister webservice SMF
     /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
     /usr/sbin/svccfg delete svc:/application/virtualbox/webservice:default
+
+    # stop and unregister zoneaccess SMF (if present)
+    zoneaccessfound=`svcs -a | grep "virtualbox/zoneaccess"`
+    if test ! -z "$zoneaccessfound"; then
+        /usr/sbin/svcadm disable -s svc:/application/virtualbox/zoneaccess
+        /usr/sbin/svccfg delete svc:/application/virtualbox/zoneaccess
+    fi
 
     # vboxdrv.sh would've been installed, we just need to call it.