--- recepies/lxc/lxc-watchdog.sh	2010/03/16 17:46:32	182
+++ recepies/lxc/lxc-watchdog.sh	2010/03/16 23:14:38	190
@@ -1,21 +1,29 @@
-#!/bin/sh
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          lxc-watchdog
+# Required-Start:    $remote_fs $named $network $time
+# Required-Stop:     $remote_fs $named $network
+# Required-Start:    
+# Required-Stop:     
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage Linux Containers startup/shutdown
+# Description:       Uses clever inotify hack to monitor container's
+#                    halt/reboot events watching /var/run/utmp
+### END INIT INFO
 
-# lxc-watchdog.sh
-#
-# Dobrica Pavlinusic <dpavlin@rot13.org> 2010-03-15
-#
-# this script can be used to start/stop Linux containers 
-# using clever inotify hack to monitor halt/reboot from
-# Tony Risinger posted to lxc-users mailing list
+# Author: Dobrica Pavlinusic <dpavlin@rot13.org>
 #
+# based on Tony Risinger post to lxc-users mailing list
 # http://www.mail-archive.com/lxc-users@lists.sourceforge.net/msg00074.html
+#
+# Install with:
+# ln -sf /srv/sysadmin-cookbook/recepies/lxc/lxc-watchdog.sh /etc/init.d/lxc-watchdog
+# update-rc.d lxc-watchdog defaults
 
 
 which inotifywait >/dev/null || apt-get install inotify-tools
 
-lxc_status() {
-	lxc-ls -1 | sort -u | xargs -i lxc-info -n {}
-}
 
 lxc_exists() {
 	name=$1
@@ -33,6 +41,15 @@
 }
 
 
+lxc_status() {
+	lxc-ls -1 | sort -u | xargs -i lxc-info -n {} | sed "s/'//g" | while read name is status ; do
+		boot="    "
+		test -s /var/lib/lxc/$name/on_boot && boot="boot"
+		echo "$name $status $boot $(lxc_rootfs $name)"
+	done
+}
+
+
 cleanup_init_scripts() {
 	rootfs=$(lxc_rootfs $1)
 
@@ -46,32 +63,44 @@
 
 setup_inittab() {
 	rootfs=$(lxc_rootfs $1)
+	remove=$2
+	add=$3
 
 	# let container respond to kill -SIGPWR
 	inittab=$rootfs/etc/inittab
-	powerfail="pw::powerfail:/sbin/init 0"
-	if ! grep "$powerfail" ${inittab} >/dev/null ; then
-		grep -v ::power ${inittab} > ${inittab}.new
-		echo $powerfail >> ${inittab}.new
+	if ! grep "$add" ${inittab} >/dev/null ; then
+		grep -v "$remove" ${inittab} > ${inittab}.new
+		echo $add >> ${inittab}.new
 		mv ${inittab}.new ${inittab}
-		echo "$initab modified"
+		echo "$inittab modified with $add"
 	fi
+}
+
 
+lxc_log() {
+	echo `date +%Y-%m-%dT%H:%M:%S` $*
 }
 
 
-lxc_stop() {
+lxc_kill() {
 	name=$1
+	sig=$2
 
 	init_pid=`lxc-ps -C init -o pid | grep "^$name" | cut -d" " -f2-`
 	if [ -z "$init_pid" ] ; then
 		lxc-info -n $name
 		exit 1
 	fi
-	echo "$name stop $init_pid"
-	/bin/kill -SIGPWR $init_pid
-	lxc-wait -n $name -s STOPPED
+	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
 }
 
 
@@ -79,10 +108,11 @@
 	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
+		test -f /var/lib/lxc/${name}/on_boot || echo $name > /var/lib/lxc/${name}/on_boot
 	fi
 }
 
@@ -97,20 +127,20 @@
 	if [ "$tasks" -eq 1 ]; then
 
 		runlevel="$(runlevel ${vps_utmp})"
-		echo "# $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
@@ -122,45 +152,82 @@
 		;;
 		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"
 
 }
 
 
-case "$1" in
+usage() {
+	echo "Usage: $0 {start|stop|restart|status|boot|disable} [name name ... ]" >&2
+	exit 3
+}
+
+command_on_lxc() {
+command=$1
+shift
+
+echo "# $command $1"
+
+case "$command" in
 
 start)
-	lxc_exists $2
-	cleanup_init_scripts $2
-	setup_inittab $2
-	lxc_start $2
-	( nohup $0 watchdog $2 >> /tmp/$2.log ) &
-	;;
-stop)
-	lxc_exists $2
-	lxc_stop $2
-	;;
-status)
-	lxc_status
-	;;
-reload|force-reload|restart)
-	lxc_stop $2
-	lxc_start $2
+	lxc_exists $1
+	cleanup_init_scripts $1
+	setup_inittab $1 ::power      "p0::powerfail:/sbin/init 0"
+	setup_inittab $1 ::ctrlaltdel "p6::ctrlaltdel:/sbin/init 6"
+	lxc_start $1
+	# 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
+	lxc_stop $1
+	;;
+reload|force-reload|restart|reboot)
+	lxc_kill $1 -SIGINT
 	;;
 watchdog)
-	lxc_watchdog $2
+	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
+	usage
 	;;
 
 esac
 
+}
+
+command=$1
+test -z "$command" && usage
+test "$command" = "status" && lxc_status && exit
+shift
+
+if [ -z "$1" ] ; then
+	ls /var/lib/lxc/*/on_boot | while read path ; do
+		name=`echo $path | cut -d/ -f5`
+		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
+		command_on_lxc $command $1
+		shift
+	done
+fi
+