Changeset 11475 in vbox for trunk/src

Timestamp:

Aug 19, 2008 8:48:02 AM (16 years ago)

Author:

vboxsync

Message:

Installer/Solaris: add webservice configuration file, used by the smf start script.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• makepackage.sh (modified) (1 diff)
• smf-vboxwebsrv.sh (modified) (1 diff)
• webservice.cfg (added)

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

@@ -129 +129 @@
         virtualbox-webservice.xml \
         smf-vboxwebsrv.sh \
+        webservice.cfg \
         vbox.copyright \
         ReadMe.txt
@@ -303 +304 @@
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(PATH_CURRENT)/virtualbox-webservice.xml         $(SOLARIS_INST_DIR)/virtualbox-webservice.xml,)
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(PATH_CURRENT)/smf-vboxwebsrv.sh                 $(SOLARIS_INST_DIR)/smf-vboxwebsrv.sh,)
+        $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(PATH_CURRENT)/webservice.cfg                    $(SOLARIS_INST_DIR)/etc/webservice.cfg,)
         $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh            $(SOLARIS_INST_DIR)/vnic_setup.sh
         $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh            $(SOLARIS_INST_DIR)/vnic_term.sh

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

@@ -91 +91 @@
 filelist_fixup prototype '$3 == "opt/VirtualBox/virtualbox-webservice.xml=virtualbox-webservice.xml"'   '$3 = "var/svc/manifest/application/virtualbox/webservice.xml=virtualbox-webservice.xml"'
 
+# webservice SMF configuration file, mark as editable.
+filelist_fixup prototype '$3 == "opt/VirtualBox/etc/webservice.cfg=webservice.cfg"'   '$1 = "e"'
+
 # explicitly set timestamp to shutup warning
 VBOXPKG_TIMESTAMP=vbox`date '+%Y%m%d%H%M%S'`

trunk/src/VBox/Installer/solaris/smf-vboxwebsrv.sh

@@ -39 +39 @@
         fi
 
+        if [ ! -f /opt/VirtualBox/etc/webservice.cfg ]; then
+            echo "ERROR: /opt/VirtualBox/etc/webservice.cfg does not exist."
+            return $SMF_EXIT_ERR_CONFIG
+        fi
+
+        . /opt/VirtualBox/etc/webservice.cfg
+
         [ -z "$VW_USER" ] && VW_USER=root
         [ -z "$VW_HOST" ] && VW_HOST=localhost