Changeset 20405 in vbox for trunk/src/VBox/Installer

Timestamp:

Jun 8, 2009 1:37:56 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/SMF: fix manifest and start script. Single VM crash no longer kills webservice, VBoxSVC and all VMs.

Location:

trunk/src/VBox/Installer/solaris

Files:

• smf-vboxwebsrv.sh (modified) (2 diffs, 1 prop)
• virtualbox-webservice.xml (modified) (2 diffs)

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

@@ -57 +57 @@
         [ -z "$VW_TIMEOUT" ] && VW_TIMEOUT=20
         [ -z "$VW_CHECK_INTERVAL" ] && VW_CHECK_INTERVAL=5
-        su - "$VW_USER" -c "/opt/VirtualBox/vboxwebsrv --background --host \"$VW_HOST\" --port \"$VW_PORT\" --timeout \"$VW_TIMEOUT\" --check-interval \"$VW_CHECK_INTERVAL\""
+        exec su - "$VW_USER" -c "/opt/VirtualBox/vboxwebsrv --host \"$VW_HOST\" --port \"$VW_PORT\" --timeout \"$VW_TIMEOUT\" --check-interval \"$VW_CHECK_INTERVAL\""
 
         VW_EXIT=$?
@@ -63 +63 @@
             echo "vboxwebsrv failed with $VW_EXIT."
             VW_EXIT=1
-        fi
-
-        # Bump per-process semaphore limit of VBoxSVC
-        PRCTLBIN=`which prctl`
-        if test ! -f "$PRTCLBIN"; then
-            # Wait for VBoxSVC to spawn
-            TRIES=0
-            while test $TRIES -le 3; do
-                VBOXSVC_PID=`ps -eo pid,fname | grep VBoxSVC | grep -v grep | cut -f 1 -d " "`
-                if test $VBOXSVC_PID -ge 0; then
-                    $PRCTLBIN -r -n project.max-sem-ids -v 1024 $VBOXSVC_PID
-                    if test $? -eq 0; then
-                        echo "Successfully bumped VBoxSVC (pid $VBOXSVC_PID) semaphore id limit to 1024."
-                    else
-                        echo "Failed to bump VBoxSVC (pid $VBOXSVC_PID) semaphore id limit."
-                    fi
-                    break
-                else
-                    sleep 1
-                fi
-                TRIES=`expr $TRIES + 1`
-            done
-            if test $TRIES -eq 3; then
-                echo "Stopped waiting for VBoxSVC to spawn..."
-                echo "Failed to bump VBoxSVC process' semaphore id limit."
-            fi
-        else
-            echo "Failed to find prctl to bump VBoxSVC semaphore id limit."
-            echo "As a result, not more than 100 VMs can be started."
         fi
     ;;

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

@@ -76 +76 @@
             type='method'
             name='stop'
-            exec='/opt/VirtualBox/smf-vboxwebsrv %m %{restarter/contract}'
+            exec=':kill'
             timeout_seconds='15'>
             <method_context>
@@ -82 +82 @@
             </method_context>
         </exec_method>
+
+        <property_group name='startd' type='framework'>
+            <!-- The default contract restarter behavior is not appropriate,
+                 it will kill VMs if the service is restarted. -->
+            <propval name='duration' type='astring' value='child' />
+            <!-- sub-process core dumps/signals shouldn't restart session -->
+            <propval name='ignore_error' type='astring' value='core,signal' />
+        </property_group>
 
         <property_group name='config' type='application'>