--- recepies/lxc/lxc-watchdog.sh	2010/03/16 15:06:30	178
+++ recepies/lxc/lxc-watchdog.sh	2010/03/16 21:36:45	187
@@ -1,51 +1,141 @@
-#!/bin/bash
-
-# based on Tony Risinger code from lxc-users
+#! /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
+
+# 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
 
+
 which inotifywait >/dev/null || apt-get install inotify-tools
 
-name=$1
 
-if [ ! -e /var/lib/lxc/$name/config ] ; then
-	echo "Usage: $0 name"
-	ls /var/lib/lxc/*/config | cut -d/ -f5
-	exit 1
-fi
+lxc_exists() {
+	name=$1
+
+	if [ ! -e /var/lib/lxc/$name/config ] ; then
+		echo "Usage: $0 name"
+		lxc_status
+		exit 1
+	fi
+}
 
-rootfs=`grep lxc.rootfs /var/lib/lxc/$name/config | cut -d= -f2`
-echo "$name rootfs $rootfs"
 
-# cleanup init scripts which don't work in containers
-ls $rootfs/etc/rc?.d/*umountfs 2>/dev/null | xargs -i rm -v {}
-ls $rootfs/etc/rc?.d/*umountroot 2>/dev/null | xargs -i rm -v {}
-ls $rootfs/etc/rc?.d/*hwclock* 2>/dev/null | xargs -i rm -v {}
+lxc_rootfs() {
+	grep lxc.rootfs "/var/lib/lxc/$1/config" | cut -d= -f2 | sed 's/^ *//'
+}
+
+
+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)"
+	done
+}
+
+
+cleanup_init_scripts() {
+	rootfs=$(lxc_rootfs $1)
+
+	ls \
+		$rootfs/etc/rc?.d/*umountfs \
+		$rootfs/etc/rc?.d/*umountroot \
+		$rootfs/etc/rc?.d/*hwclock* \
+	2>/dev/null | xargs -i rm -v {}
+}
+
+
+setup_inittab() {
+	rootfs=$(lxc_rootfs $1)
+	remove=$2
+	add=$3
+
+	# let container respond to kill -SIGPWR
+	inittab=$rootfs/etc/inittab
+	if ! grep "$add" ${inittab} >/dev/null ; then
+		grep -v "$remove" ${inittab} > ${inittab}.new
+		echo $add >> ${inittab}.new
+		mv ${inittab}.new ${inittab}
+		echo "$inittab modified with $add"
+	fi
+}
 
-lxc-info -n $name | grep RUNNING || lxc-start -d -n $name -o /tmp/${name}.log && echo "$name start"
+
+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 kill $sig $init_pid"
+	/bin/kill $sig $init_pid
+}
+
+lxc_stop() {
+	lxc_kill $name -SIGPWR
+	lxc-wait -n $name -s STOPPED
+#	rm -f /var/lib/lxc/${name}/on_boot
+}
+
+
+lxc_start() {
+	name=$1
+
+	if ! lxc-info -n $name | grep RUNNING ; then
+		echo "$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
+}
+
+lxc_log() {
+	echo `date +%Y-%m-%dT%H:%M:%S` $*
+}
+
+lxc_watchdog() {
+name=$1
+rootfs=$(lxc_rootfs $1)
 
 while true; do
-	# time of 5 minutes on it JUST IN CASE...
 	vps_utmp=${rootfs}/var/run/utmp
-	inotifywait -qqt 300 ${vps_utmp}
-	if [ $(wc -l < /cgroup/${name}/tasks) -eq 1 ]; then
+	tasks=`wc -l < /cgroup/${name}/tasks`
+	test -z "$tasks" && exit 1
+	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
-			mount /mnt/llin -o remount,rw
 			lxc-start -d -n ${name} -o /tmp/${name}.log
 		;;
 		*)
@@ -54,6 +144,69 @@
 			[ "$state" = "RUNNING" ] || break
 		;;
 		esac
+	else
+		lxc_log "$name $tasks tasks"
 	fi
+
+	# time of 5 minutes on it JUST IN CASE...
+	inotifywait -qqt 300 ${vps_utmp}
 done
 
+lxc_log "$name exited"
+
+}
+
+
+command_on_lxc() {
+command=$1
+shift
+
+echo "# $command $1"
+
+case "$command" in
+
+start)
+	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 $1
+	;;
+*)
+	echo "Usage: $0 {start|stop|restart|status}" >&2
+	exit 3
+	;;
+
+esac
+
+}
+
+command=$1
+shift
+
+test "$command" = "status" && lxc_status && exit
+
+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
+	done
+else
+	while [ ! -z "$1" ] ; do
+		command_on_lxc $command $1
+		shift
+	done
+fi
+