vbox的更動 50295 路徑 trunk/src/VBox/Installer/solaris

時間撮記:

2014-1-30 下午07:31:51 (11 年 以前)

作者:

vboxsync

訊息:

Autostart/Solaris: Fix the autostart script, contributed by kburtch. Make the group configurable (defaulting to staff like before)

位置:

trunk/src/VBox/Installer/solaris

檔案:

• smf-vboxautostart.sh (修改) (7 筆差異)
• virtualbox-autostart.xml (修改) (1 筆差異)

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

@@ -2 +2 @@
 # $Id$
 
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2014 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 case $VW_OPT in
     start)
-        if [ ! -x /opt/VirtualBox/VBoxAutostart ]; then
+        if [ ! -f /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."
+        if [ ! -x /opt/VirtualBox/VBoxAutostart ]; then
+            echo "ERROR: /opt/VirtualBox/VBoxAutostart is not exectuable."
             return $SMF_EXIT_ERR_CONFIG
         fi
@@ -44 +44 @@
         VW_LOGINTERVAL=`/usr/bin/svcprop -p config/loginterval $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_LOGINTERVAL=
+        VW_VBOXGROUP=`/usr/bin/svcprop -p config/vboxgroup $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_VBOXGROUP=
 
         # Provide sensible defaults
@@ -50 +52 @@
         [ -z "$VW_LOGSIZE" ] && VW_LOGSIZE=104857600
         [ -z "$VW_LOGINTERVAL" ] && VW_LOGINTERVAL=86400
+        [ -z "$VW_VBOXGROUP" ] && VW_VBOXGROUP=staff
 
         # Get all users
-        for VW_USER in `logins -g staff`
+        for VW_USER in `logins -g $VW_VBOXGROUP | cut -d' ' -f1`
         do
-            exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxAutostart --background --start --config \"$VW_CONFIG\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
+            su - "$VW_USER" -c "/opt/VirtualBox/VBoxAutostart --background --start --config \"$VW_CONFIG\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
 
             VW_EXIT=$?
@@ -65 +68 @@
     ;;
     stop)
-        if [ ! -x /opt/VirtualBox/VBoxAutostart ]; then
+        if [ ! -f /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."
+        if [ ! -x /opt/VirtualBox/VBoxAutostart ]; then
+            echo "ERROR: /opt/VirtualBox/VBoxAutostart is not executable."
             return $SMF_EXIT_ERR_CONFIG
         fi
@@ -84 +87 @@
         VW_LOGINTERVAL=`/usr/bin/svcprop -p config/loginterval $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_LOGINTERVAL=
+        VW_VBOXGROUP=`/usr/bin/svcprop -p config/vboxgroup $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_VBOXGROUP=
 
         # Provide sensible defaults
@@ -90 +95 @@
         [ -z "$VW_LOGSIZE" ] && VW_LOGSIZE=104857600
         [ -z "$VW_LOGINTERVAL" ] && VW_LOGINTERVAL=86400
+        [ -z "$VW_VBOXGROUP" ] && VW_VBOXGROUP=staff
 
         # Get all users
-        for VW_USER in `logins -g staff`
+        for VW_USER in `logins -g $VW_VBOXGROUP | cut -d' ' -f1`
         do
-            exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxAutostart --stop --config \"$VW_CONFIG\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
+            su - "$VW_USER" -c "/opt/VirtualBox/VBoxAutostart --stop --config \"$VW_CONFIG\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
 
             VW_EXIT=$?

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

@@ -94 +94 @@
         <property_group name='config' type='application'>
             <propval name='config' type='astring' value='/etc/vbox/autostart.cfg' />
+            <propval name='vboxgroup' type='astring' value='staff' />
         </property_group>