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

Timestamp:

Oct 16, 2012 3:18:28 PM (12 years ago)

Author:

vboxsync

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

81422

Message:

Autostart/stop: Further work on the stop part

Location:

trunk/src/VBox/Installer/solaris

Files:

• smf-vboxautostart.sh (modified) (1 diff)
• virtualbox-autostart.xml (modified) (1 diff)

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

@@ -65 +65 @@
     ;;
     stop)
-        # Kill service contract
-        smf_kill_contract $2 TERM 1
+        if [ ! -x /opt/VirtualBox/VBoxAutostart ]; then
+            echo "ERROR: /opt/VirtualBox/VBoxAutostart does not exist."
+            return $SMF_EXIT_ERR_CONFIG
+        fi
+
+        if [ ! -f /opt/VirtualBox/VBoxAutostart ]; then
+            echo "ERROR: /opt/VirtualBox/VBoxAutostart does not exist."
+            return $SMF_EXIT_ERR_CONFIG
+        fi
+
+        # Get svc configuration
+        VW_CONFIG=`/usr/bin/svcprop -p config/config $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_CONFIG=
+        VW_ROTATE=`/usr/bin/svcprop -p config/logrotate $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_ROTATE=
+        VW_LOGSIZE=`/usr/bin/svcprop -p config/logsize $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_LOGSIZE=
+        VW_LOGINTERVAL=`/usr/bin/svcprop -p config/loginterval $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_LOGINTERVAL=
+
+        # Provide sensible defaults
+        [ -z "$VW_CONFIG" ] && VW_CONFIG=/etc/vbox/autostart.cfg
+        [ -z "$VW_ROTATE" ] && VW_ROTATE=10
+        [ -z "$VW_LOGSIZE" ] && VW_LOGSIZE=104857600
+        [ -z "$VW_LOGINTERVAL" ] && VW_LOGINTERVAL=86400
+
+        # Get all users
+        for VW_USER in `logins -g staff`
+        do
+            exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxAutostart --stop --config \"$VW_CONFIG\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
+
+            VW_EXIT=$?
+            if [ $VW_EXIT != 0 ]; then
+                echo "VBoxAutostart failed with $VW_EXIT."
+                VW_EXIT=1
+                break
+            fi
+        done
     ;;
     *)

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

@@ -71 +71 @@
             type='method'
             name='stop'
-            exec=':kill'
-            timeout_seconds='15'>
+            exec='/opt/VirtualBox/smf-vboxautostart.sh %m'
+            timeout_seconds='0'>
             <method_context>
                 <method_credential user='root' group='root' />