--- recepies/lxc/lxc-watchdog.sh	2010/03/16 20:51:46	185
+++ recepies/lxc/lxc-watchdog.sh	2010/03/16 23:05:31	189
@@ -39,9 +39,9 @@
 
 lxc_status() {
 	lxc-ls -1 | sort -u | xargs -i lxc-info -n {} | sed "s/'//g" | while read name is status ; do
-		on_boot="       "
-		test -s /var/lib/lxc/$name/on_boot && on_boot="on_boot"
-		echo "$name $status $on_boot $(lxc_rootfs $name)"
+		boot="    "
+		test -s /var/lib/lxc/$name/on_boot && boot="boot"
+		echo "$name $status $boot $(lxc_rootfs $name)"
 	done
 }
 
@@ -73,6 +73,11 @@
 }
 
 
+lxc_log() {
+	echo `date +%Y-%m-%dT%H:%M:%S` $*
+}
+
+
 lxc_kill() {
 	name=$1
 	sig=$2
@@ -82,13 +87,15 @@
 		lxc-info -n $name
 		exit 1
 	fi
-	echo "$name kill $sig $init_pid"
+	lxc_log "$name kill $sig $init_pid"
 	/bin/kill $sig $init_pid
 }
 
 lxc_stop() {
+	lxc_log "$name stop"
 	lxc_kill $name -SIGPWR
 	lxc-wait -n $name -s STOPPED
+	lxc_log "$name stoped"
 #	rm -f /var/lib/lxc/${name}/on_boot
 }
 
@@ -97,7 +104,7 @@
 	name=$1
 
 	if ! lxc-info -n $name | grep RUNNING ; then
-		echo "$name start"
+		lxc_log "$name start"
 		lxc-start -n $name -o /tmp/${name}.log -d
 		lxc-wait  -n $name -s RUNNING
 		lxc-info  -n $name
@@ -116,20 +123,20 @@
 	if [ "$tasks" -eq 1 ]; then
 
 		runlevel="$(runlevel ${vps_utmp})"
-		echo `date +%Y-%m-%dT%H:%M:%S` "$name runlevel $runlevel"
+		lxc_log "$name runlevel $runlevel"
 
 		case $runlevel in
 		N*)
 			# nothing for new boot state
 		;;
 		??0)
-			echo "$name halt"
+			lxc_log "$name halt"
 			lxc-stop -n "${name}"
 			lxc-wait -n ${name} -s STOPPED
 			break
 		;;
 		??6)
-			echo "$name reboot";
+			lxc_log "$name reboot";
 			lxc-stop -n ${name}
 			lxc-wait -n ${name} -s STOPPED
 			lxc-start -d -n ${name} -o /tmp/${name}.log
@@ -141,14 +148,14 @@
 		;;
 		esac
 	else
-		echo "# $name $tasks tasks"
+		lxc_log "$name $tasks tasks"
 	fi
 
 	# time of 5 minutes on it JUST IN CASE...
 	inotifywait -qqt 300 ${vps_utmp}
 done
 
-echo "${name} exited"
+lxc_log "$name watchdog exited"
 
 }
 
@@ -167,7 +174,8 @@
 	setup_inittab $1 ::power      "p0::powerfail:/sbin/init 0"
 	setup_inittab $1 ::ctrlaltdel "p6::ctrlaltdel:/sbin/init 6"
 	lxc_start $1
-	( nohup $0 watchdog $1 >> /tmp/$1.log 2>/dev/null ) &
+	# give container 5 seconds to start more than one process
+	( sleep 5 ; nohup $0 watchdog $1 >> /tmp/$1.log 2>/dev/null ) &
 	;;
 stop|halt)
 	lxc_exists $1
@@ -179,6 +187,12 @@
 watchdog)
 	lxc_watchdog $1
 	;;
+boot)
+	echo $1 > /var/lib/lxc/$1/on_boot
+	;;
+disable)
+	echo -n > /var/lib/lxc/$1/on_boot
+	;;
 *)
 	echo "Usage: $0 {start|stop|restart|status}" >&2
 	exit 3
@@ -196,7 +210,11 @@
 if [ -z "$1" ] ; then
 	ls /var/lib/lxc/*/on_boot | while read path ; do
 		name=`echo $path | cut -d/ -f5`
-		command_on_lxc $command $name
+		if [ "$command" != "start" -o "$command" = "start" -a -s $path ] ; then
+			command_on_lxc $command $name
+		else
+			echo "# skip $command $name"
+		fi
 	done
 else
 	while [ ! -z "$1" ] ; do