Changeset 36686 in vbox

Timestamp:

Apr 15, 2011 2:39:41 PM (14 years ago)

Author:

vboxsync

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

71193

Message:

Installer/solaris: packaging, scripts and SMF manifests for VBoxBalloonCtrl

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (6 diffs)
• makepackage.sh (modified) (2 diffs)
• smf-vboxballoonctrl.sh (copied) (copied from trunk/src/VBox/Installer/solaris/smf-vboxwebsrv.sh ) (4 diffs)
• virtualbox-balloonctrl.xml (copied) (copied from trunk/src/VBox/Installer/solaris/virtualbox-webservice.xml ) (4 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2007-2010 Oracle Corporation
+# Copyright (C) 2007-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -158 +158 @@
         $(VBOX_PATH_SOL_INST_SRC)/VBox.sh \
         $(VBOX_PATH_SOL_INST_SRC)/pkginstall.sh \
+        $(VBOX_PATH_SOL_INST_SRC)/smf-vboxballoonctrl.sh \
         $(if $(VBOX_WITH_WEBSERVICES),$(VBOX_PATH_SOL_INST_SRC)/smf-vboxwebsrv.sh,)
 
@@ -301 +302 @@
         pkginstall.sh \
         $(if $(VBOX_WITH_PYTHON),vboxshell.py,) \
-        $(if $(VBOX_WITH_WEBSERVICES),smf-vboxwebsrv.sh,) \
+        smf-vboxballoonctrl.sh \
+        $(if $(VBOX_WITH_WEBSERVICES),smf-vboxwebsrv.sh,)
 
 # Things packed explicitly, not from $(PATH_BIN), track these to clean-up properly
@@ -313 +315 @@
         $(if $(VBOX_WITH_QTGUI),virtualbox.desktop,) \
         virtualbox.xml \
+        virtualbox-balloonctrl.xml \
         virtualbox-webservice.xml \
         virtualbox-zoneaccess.xml \
@@ -389 +392 @@
 SOLARIS_STRIP_EXES += \
         $(if $(VBOX_WITH_HEADLESS),VBoxHeadless) \
+        VBoxBalloonCtrl \
         $(if $(VBOX_WITH_WEBSERVICES),vboxwebsrv) \
         $(if $(VBOX_WITH_WEBSERVICES),webtest)
@@ -617 +621 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox-zoneaccess.xml                                       $(SOLARIS_VBOXSMF_DIR)/virtualbox-zoneaccess.xml
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox-webservice.xml         $(SOLARIS_VBOXSMF_DIR)/virtualbox-webservice.xml,)
+        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox-balloonctrl.xml                                      $(SOLARIS_VBOXSMF_DIR)/virtualbox-balloonctrl.xml
         $(QUIET)$(if $(not $(VBOX_WITH_NETFLT))$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh            $(SOLARIS_VBOXINST_DIR)/vnic_setup.sh,)
         $(QUIET)$(if $(not $(VBOX_WITH_NETFLT))$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh            $(SOLARIS_VBOXINST_DIR)/vnic_term.sh,)

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

@@ -6 +6 @@
 
 #
-# Copyright (C) 2007-2010 Oracle Corporation
+# Copyright (C) 2007-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -116 +116 @@
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxManage
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxSDL
+ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxBalloonCtrl
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/vboxwebsrv
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/webtest

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

@@ -14 +14 @@
 
 #
-# smf-vboxwebsrv method
+# smf-vboxballoonctrl method
 #
 # Argument is the method name (start, stop, ...)
@@ -25 +25 @@
 case $VW_OPT in
     start)
-        if [ ! -x /opt/VirtualBox/vboxwebsrv ]; then
-            echo "ERROR: /opt/VirtualBox/vboxwebsrv does not exist."
+        if [ ! -x /opt/VirtualBox/VBoxBalloonCtrl ]; then
+            echo "ERROR: /opt/VirtualBox/VBoxBalloonCtrl does not exist."
             return $SMF_EXIT_ERR_CONFIG
         fi
 
-        if [ ! -f /opt/VirtualBox/vboxwebsrv ]; then
-            echo "ERROR: /opt/VirtualBox/vboxwebsrv does not exist."
+        if [ ! -f /opt/VirtualBox/VBoxBalloonCtrl ]; then
+            echo "ERROR: /opt/VirtualBox/VBoxBalloonCtrl does not exist."
             return $SMF_EXIT_ERR_CONFIG
         fi
@@ -38 +38 @@
         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=
-        VW_TIMEOUT=`/usr/bin/svcprop -p config/timeout $SMF_FMRI 2>/dev/null`
-        [ $? != 0 ] && VW_TIMEOUT=
-        VW_CHECK_INTERVAL=`/usr/bin/svcprop -p config/checkinterval $SMF_FMRI 2>/dev/null`
-        [ $? != 0 ] && VW_CHECK_INTERVAL=
-        VW_KEEPALIVE=`/usr/bin/svcprop -p config/keepalive $SMF_FMRI 2>/dev/null`
-        [ $? != 0 ] && VW_KEEPALIVE=
+        VW_INTERVAL=`/usr/bin/svcprop -p config/interval $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_INTERVAL=
+        VW_INCREMENT=`/usr/bin/svcprop -p config/increment $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_INCREMENT=
+        VW_DECREMENT=`/usr/bin/svcprop -p config/decrement $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_DECREMENT=
+        VW_LOWERLIMIT=`/usr/bin/svcprop -p config/lowerlimit $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_LOWERLIMIT=
         VW_ROTATE=`/usr/bin/svcprop -p config/logrotate $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_ROTATE=
@@ -57 +55 @@
         # Provide sensible defaults
         [ -z "$VW_USER" ] && VW_USER=root
-        [ -z "$VW_HOST" ] && VW_HOST=localhost
-        [ -z "$VW_PORT" -o "$VW_PORT" -eq 0 ] && VW_PORT=18083
-        [ -z "$VW_TIMEOUT" ] && VW_TIMEOUT=20
-        [ -z "$VW_CHECK_INTERVAL" ] && VW_CHECK_INTERVAL=5
-        [ -z "$VW_KEEPALIVE" ] && VW_KEEPALIVE=100
+        [ -z "$VW_INTERVAL" ] && VW_INTERVAL=10000
+        [ -z "$VW_INCREMENT" ] && VW_INCREMENT=256
+        [ -z "$VW_DECREMENT" ] && VW_DECREMENT=128
+        [ -z "$VW_LOWERLIMIT" ] && VW_LOWERLIMIT=64
         [ -z "$VW_ROTATE" ] && VW_ROTATE=10
         [ -z "$VW_LOGSIZE" ] && VW_LOGSIZE=104857600
         [ -z "$VW_LOGINTERVAL" ] && VW_LOGINTERVAL=604800
-        exec su - "$VW_USER" -c "/opt/VirtualBox/vboxwebsrv --background --host \"$VW_HOST\" --port \"$VW_PORT\" --timeout \"$VW_TIMEOUT\" --check-interval \"$VW_CHECK_INTERVAL\" --keepalive \"$VW_KEEPALIVE\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
+        exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxBalloonCtrl --background --interval \"$VW_INTERVAL\" --balloon-inc \"$VW_INCREMENT\" --balloon-dec \"$VW_DECREMENT\" --balloon-lower-limit \"$VW_LOWERLIMIT\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
 
         VW_EXIT=$?
         if [ $VW_EXIT != 0 ]; then
-            echo "vboxwebsrv failed with $VW_EXIT."
+            echo "VBoxBalloonCtrl failed with $VW_EXIT."
             VW_EXIT=1
         fi

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

@@ -2 +2 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-# Solaris SMF service manifest for VirtualBox webservice server.
+# Solaris SMF service manifest for VirtualBox balloon control service.
 # $Id$
 
@@ -16 +16 @@
 -->
 
-<service_bundle type='manifest' name='SUNWvbox:webservice'>
+<service_bundle type='manifest' name='SUNWvbox:balloonctrl'>
 
 <service
-    name='application/virtualbox/webservice'
+    name='application/virtualbox/balloonctrl'
     type='service'
     version='1'>
@@ -52 +52 @@
 
         <dependent
-            name='virtualbox-webservice_multi-user'
+            name='virtualbox-balloonctrl_multi-user'
             grouping='optional_all'
             restart_on='none'>
@@ -61 +61 @@
             type='method'
             name='start'
-            exec='/opt/VirtualBox/smf-vboxwebsrv.sh %m'
+            exec='/opt/VirtualBox/smf-vboxballoonctrl.sh %m'
             timeout_seconds='15'>
             <method_context>