X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=vboxautostart.init;h=f9ce4cb02a2f4e207579fc333d451dc913858ec5;hp=c461593ebaf49d27dd2e17d7579194ab905e5f5e;hb=HEAD;hpb=98a7cd534e2081d1947eda40aec8fdfde2283fb4

diff --git a/vboxautostart.init b/vboxautostart.init
index c461593..f9ce4cb 100755
--- 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 "$@"
 }
 
@@ -34,15 +35,16 @@ start() {
 	[ -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
 
-	for user in `ls $VBOXAUTOSTART_DB/*.start 2>/dev/null`; do
-		user=$(basename $user | sed -ne "s/\(.*\).start/\1/p")
+	for file in $VBOXAUTOSTART_DB/*.start; do
+		test -f "$file" || continue
+		user=${file##*/}; user=${user%.start}
 		start_daemon $user $VBOXAUTOSTART $PARAMS
 	done
 
@@ -59,15 +61,16 @@ stop() {
 	[ -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
 
-	for user in `ls $VBOXAUTOSTART_DB/*.stop 2>/dev/null`; do
-		user=$(basename $user | sed -ne "s/\(.*\).stop/\1/p")
+	for file in $VBOXAUTOSTART_DB/*.stop; do
+		test -f "$file" || continue
+		user=${file##*/}; user=${user%.stop}
 		start_daemon $user $VBOXAUTOSTART $PARAMS
 	done