- rel 2 (libvpx 1.14)

[packages/VirtualBox.git] / vboxautostart.init

diff --git a/vboxautostart.init b/vboxautostart.init
index 4632537d05022669b8362963cd787e97cb8675ad..f9ce4cb02a2f4e207579fc333d451dc913858ec5 100755 (executable)
--- a/vboxautostart.init
+++ b/vboxautostart.init
@@ -11,7 +11,7 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-VBOXAUTOSTART_DB=/etc/vbox
+VBOXAUTOSTART_DB=/etc/vbox/autostart
 VBOXAUTOSTART_CONFIG=/etc/vbox/autostart.cfg
 VBOXAUTOSTART=@INSTALL_DIR@/VBoxAutostart
 
@@ -21,6 +21,7 @@ VBOXAUTOSTART=@INSTALL_DIR@/VBoxAutostart
 start_daemon() {
        local user="$1"
        shift
+       show "VMs for user '%s'" "$user"
        daemon --user $user "$@"
 }
 
@@ -31,20 +32,21 @@ start() {
                return
        fi
 
-    [ -z "$VBOXAUTOSTART_DB" ] && exit 0
-    [ -z "$VBOXAUTOSTART_CONFIG" ] && exit 0
+       [ -z "$VBOXAUTOSTART_DB" ] && exit 0
+       [ -z "$VBOXAUTOSTART_CONFIG" ] && exit 0
 
-       msg_starting "VirtualBox VMs configured for autostart"
+       msg_starting "VirtualBox VMs configured for autostart"; busy; echo
 
-    local user PARAMS="--background --start --config $VBOXAUTOSTART_CONFIG"
+       local file user PARAMS="--background --start --config $VBOXAUTOSTART_CONFIG"
 
-    # prevent inheriting this setting to VBoxSVC
-    unset VBOX_RELEASE_LOG_DEST
+       # prevent inheriting this setting to VBoxSVC
+       unset VBOX_RELEASE_LOG_DEST
 
-    for user in `ls $VBOXAUTOSTART_DB/*.start 2>/dev/null`; do
-               user=$(basename $user | sed -ne "s/\(.*\).start/\1/p")
-        start_daemon $user $VBOXAUTOSTART $PARAMS
-    done
+       for file in $VBOXAUTOSTART_DB/*.start; do
+               test -f "$file" || continue
+               user=${file##*/}; user=${user%.start}
+               start_daemon $user $VBOXAUTOSTART $PARAMS
+       done
 
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/vboxautostart
 }
@@ -55,21 +57,22 @@ stop() {
                return
        fi
 
-    [ -z "$VBOXAUTOSTART_DB" ] && exit 0
-    [ -z "$VBOXAUTOSTART_CONFIG" ] && exit 0
+       [ -z "$VBOXAUTOSTART_DB" ] && exit 0
+       [ -z "$VBOXAUTOSTART_CONFIG" ] && exit 0
 
        # Stop daemons.
-       msg_stopping "VirtualBox Autostart"
+       msg_stopping "VirtualBox Autostart"; busy; echo
 
-    local user PARAMS="--stop --config $VBOXAUTOSTART_CONFIG"
+       local file user PARAMS="--stop --config $VBOXAUTOSTART_CONFIG"
 
-    # prevent inheriting this setting to VBoxSVC
-    unset VBOX_RELEASE_LOG_DEST
+       # prevent inheriting this setting to VBoxSVC
+       unset VBOX_RELEASE_LOG_DEST
 
-    for user in `ls $VBOXAUTOSTART_DB/*.stop 2>/dev/null`; do
-               user=$(basename $user | sed -ne "s/\(.*\).stop/\1/p")
-        start_daemon $user $VBOXAUTOSTART $PARAMS
-    done
+       for file in $VBOXAUTOSTART_DB/*.stop; do
+               test -f "$file" || continue
+               user=${file##*/}; user=${user%.stop}
+               start_daemon $user $VBOXAUTOSTART $PARAMS
+       done
 
        rm -f /var/lock/subsys/vboxautostart
 }