Changeset 13981 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Nov 8, 2008 3:45:00 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/Installer: VBoxZoneAccess.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (8 diffs)
• VBoxZoneAccess.c (added)
• virtualbox-zoneaccess.xml (modified) (2 diffs)

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

@@ -55 +55 @@
 # Targets
 #
+PROGRAMS += VBoxZoneAccess
 INSTALLS        += solaris-doc
 PACKING         += $(PATH_BIN)/$(PKG_FILENAME).tar.gz $(PATH_BIN)/$(DBG_ARCHIVE)
@@ -62 +63 @@
 
 #
+# VBoxZoneAccess
+#
+VBoxZoneAccess_TEMPLATE = VBOXR3EXE
+VBoxZoneAccess_DEPS     = $(VBOX_SVN_REV_KMK)
+VBoxZoneAccess_SOURCES  = \
+        VBoxZoneAccess.c
+VBoxZoneAccess_LIBS     = \
+        $(LIB_RUNTIME)
+
+
 # Solaris installs.
 #
@@ -102 +113 @@
         $(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \
         VBoxSettings.so \
+        VBoxZoneAccess \
         components/VBoxC.so \
         components/VBoxSVCM.so \
@@ -156 +168 @@
         virtualbox-webservice.xml \
         virtualbox-zoneaccess.xml \
-        zoneaccess.sh \
         smf-vboxwebsrv.sh \
         vbox.copyright \
@@ -299 +310 @@
         $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(PATH_BIN)/VBoxPython.so                           $(SOLARIS_INST_DIR)/$(VBOX_SOL_PYTHON_INST)VBoxPython.so)
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/VBoxSettings.so                                                  $(SOLARIS_INST_DIR)/VBoxSettings.so
+        $(QUIET)$(INSTALL) -m 0755 $(PATH_BIN)/VBoxZoneAccess                                                   $(SOLARIS_INST_DIR)/VBoxZoneAccess
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/components/VBoxC.so                                              $(SOLARIS_INST_DIR)/components/VBoxC.so
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/components/VBoxSVCM.so                                           $(SOLARIS_INST_DIR)/components/VBoxSVCM.so
@@ -350 +362 @@
         $(QUIET)$(if $(VBOX_DO_STRIP),$(if $(VBOX_WITH_PYTHON),strip $(SOLARIS_INST_DIR)/$(VBOX_SOL_PYTHON_INST)VBoxPython.so,),)
         $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/VBoxSettings.so,)
+        $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/VBoxZoneAccess,)
         $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/components/VBoxC.so,)
         $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/components/VBoxSVCM.so,)
@@ -392 +405 @@
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/smf-vboxwebsrv.sh                 $(SOLARIS_INST_DIR)/smf-vboxwebsrv.sh,)
         $(QUIET)$(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,)
@@ -497 +509 @@
         $(QUIET)$(if $(VBOX_WITH_PYTHON),$(SOL_DBG_OBJCOPY) $(PATH_BIN)/VBoxPython.so                             $(SOLARIS_DBG_DIR)/VBoxPython.so,)
         $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/VBoxSettings.so                                                    $(SOLARIS_DBG_DIR)/VBoxSettings.so
+        $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/VBoxZoneAccess                                                     $(SOLARIS_DBG_DIR)/VBoxZoneAccess
         $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/components/VBoxC.so                                                $(SOLARIS_DBG_DIR)/components/VBoxC.so
         $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/components/VBoxSVCM.so                                             $(SOLARIS_DBG_DIR)/components/VBoxSVCM.so

trunk/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml

@@ -52 +52 @@
         type='method'
         name='start'
-        exec='/opt/VirtualBox/zoneaccess.sh'
-        timeout_seconds='30' >
+        exec='/opt/VirtualBox/VBoxZoneAccess'
+        timeout_seconds='10' >
         <method_context>
             <method_credential user='root' group='root' />
@@ -63 +63 @@
         name='stop'
         exec=':kill'
-        timeout_seconds='30' >
+        timeout_seconds='10' >
         <method_context>
             <method_credential user='root' group='root' />