Changeset 11510 in vbox for trunk/src

Timestamp:

Aug 20, 2008 11:46:39 AM (17 years ago)

Author:

vboxsync

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

35044

Message:

Installer/solaris: change the smf stuff once again. By coincidence I discovered that there is a property store.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• makepackage.sh (modified) (1 diff)
• postinstall.sh (modified) (1 diff)
• smf-vboxwebsrv.sh (modified) (1 diff)
• virtualbox-webservice.xml (modified) (2 diffs)
• webservice.cfg (deleted)

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

@@ -129 +129 @@
         virtualbox-webservice.xml \
         smf-vboxwebsrv.sh \
-        webservice.cfg \
         vbox.copyright \
         ReadMe.txt
@@ -304 +303 @@
         $(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

@@ -94 +94 @@
 filelist_fixup prototype '$3 == "opt/VirtualBox/smf-vboxwebsrv.sh=smf-vboxwebsrv.sh"'                   '$3 = "opt/VirtualBox/smf-vboxwebsrv=smf-vboxwebsrv.sh"'
 
-# 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/postinstall.sh

@@ -63 +63 @@
 fi
 /usr/sbin/removef $PKGINST /opt/VirtualBox/etc/devlink.tab 1>/dev/null
-rm -f /opt/VirtualBox/etc/devlink.tab
-#disabled as /opt/VirtualBox/etc is actually used for permanent config files.
-#/usr/sbin/removef $PKGINST /opt/VirtualBox/etc 1>/dev/null
-#rm -rf /opt/VirtualBox/etc
+/usr/sbin/removef $PKGINST /opt/VirtualBox/etc 1>/dev/null
+rm -rf /opt/VirtualBox/etc
 /usr/sbin/removef -f $PKGINST
 

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
+        # Get svc configuration
+        VW_USER=`/usr/bin/svcprop -p config/user $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_USER=
+        VW_HOST=`/usr/bin/svcprop -p config/host $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_HOST=
+        VW_PORT=`/usr/bin/svcprop -p config/port $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_PORT=
 
-        . /opt/VirtualBox/etc/webservice.cfg
-
+        # Provide sensible defaults
         [ -z "$VW_USER" ] && VW_USER=root
         [ -z "$VW_HOST" ] && VW_HOST=localhost

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

@@ -75 +75 @@
         type='method'
         name='stop'
-        exec='/opt/VirtualBox/smf-vboxwebsrv %m'
+        exec='/opt/VirtualBox/smf-vboxwebsrv %m %{restarter/contract}'
         timeout_seconds='15'>
         <method_context>
@@ -81 +81 @@
         </method_context>
     </exec_method>
+
+    <property_group name='config' type='application'>
+        <propval name='user' type='astring' value='root' />
+        <propval name='host' type='astring' value='localhost' />
+        <propval name='port' type='integer' value='18083' />
+    </property_group>
 
     <stability value='External' />