--- recepies/lxc/lxc-watchdog.sh	2010/09/11 11:51:37	228
+++ recepies/lxc/lxc-watchdog.sh	2011/12/13 12:54:24	284
@@ -40,15 +40,26 @@
 	grep '^ *lxc\.rootfs *=' "/var/lib/lxc/$1/config" | cut -d= -f2 | sed 's/^ *//'
 }
 
+lxc_hostname() {
+	inside=`cat $(lxc_rootfs $1)/etc/hostname`
+	config=`grep lxc.utsname /var/lib/lxc/$name/config | cut -d= -f2`
+	echo "$config [$inside]";
+}
+
+lxc_ip() {
+	( grep lxc.network.ipv4 /var/lib/lxc/$name/config | grep -v '^#' | cut -d= -f2 || \
+	grep address $(lxc_rootfs $name)/etc/network/interfaces | grep -v '^#' | sed 's/.*address //' ) | \
+	head -1 | \
+	sed -e 's/ *//g' -e 's/\/.*$//'
+}
 
 lxc_status() {
-	( find /var/lib/lxc/ -name "config" | cut -d/ -f5 | sort -u | xargs -i lxc-info -n {} | sed "s/'//g" | while read name is status ; do
+	( find /var/lib/lxc/ -name "config" | cut -d/ -f5 | sort -u | while read name ; do
+		status=`lxc-info -n $name 2>/dev/null | grep state: | cut -d: -f2`     # 0.7.5
+		test -z "$status" && status=`lxc-info -n $name | sed -e 's/^.* is //'` # 0.7.2
 		boot="-"
-		hostname=`cat $(lxc_rootfs $name)/etc/hostname`
-		ip=`grep address $(lxc_rootfs $name)/etc/network/interfaces | sed 's/.*address //'`
-		test -z "$ip" && ip=`grep lxc.network.ipv4 /var/lib/lxc/narada/config | cut -d= -f2`
 		test -s /var/lib/lxc/$name/on_boot && boot="boot"
-		echo "$name $status $boot $(lxc_rootfs $name) $ip $hostname"
+		echo "$name $status $boot $(lxc_rootfs $name) $(lxc_ip $name) $(lxc_hostname $name)"
 	done ) | column -t
 }
 
@@ -57,13 +68,16 @@
 	rootfs=$(lxc_rootfs $1)
 
 	ls \
+		$rootfs/etc/rc?.d/*checkroot* \
 		$rootfs/etc/rc?.d/*umountfs \
 		$rootfs/etc/rc?.d/*umountroot \
 		$rootfs/etc/rc?.d/*hwclock* \
 		$rootfs/etc/rc?.d/*udev* \
+		$rootfs/etc/rc?.d/*checkfs* \
 	2>/dev/null | xargs -i rm -v {}
 
 	echo $1 > $rootfs/etc/hostname
+	grep $1 $rootfs/etc/hosts || echo "$(lxc_ip $1) $1" >> $rootfs/etc/hosts
 }
 
 
@@ -92,7 +106,11 @@
 	name=$1
 	sig=$2
 
-	init_pid=`lxc-ps -C init -o pid | grep "^$name" | cut -d" " -f2-`
+	ver=`lxc-version | cut -d: -f2 | sed 's/\.//g'`
+	opts=''
+	test $ver -ge 075 && opts='--'
+
+	init_pid=`lxc-ps $opts -C init -o pid | grep "^$name" | cut -d" " -f2-`
 	if [ -z "$init_pid" ] ; then
 		lxc-info -n $name
 		exit 1
@@ -121,6 +139,8 @@
 
 	if ! lxc-info -n $name | grep RUNNING ; then
 		lxc_log "$name start"
+		dev=`df -P $rootfs | tail -1 | cut -d" " -f1`
+		mount $dev -o remount,rw # fix debian upgrade which remounts dir ro
 		lxc-start -n $name -o /tmp/${name}.log -d
 		lxc-wait  -n $name -s RUNNING
 		lxc-info  -n $name
@@ -131,21 +151,29 @@
 lxc_watchdog() {
 name=$1
 rootfs=$(lxc_rootfs $1)
+run=$rootfs/var/run
+test -L $run && run=$rootfs/`readlink $run` # recent Debian have symlink to /run
+cd $run || echo "can't cd watchdog into $run"
 
 while true; do
-	vps_utmp=${rootfs}/var/run/utmp
 	tasks=`wc -l < /cgroup/${name}/tasks`
+	stop_on=1 # init
+	sulogins=`lxc-ps --name $name | grep sulogin | wc -l`
+	if [ "$sulogins" -gt 0 ] ; then
+		stop_on=`expr $stop_on + $sulogins`
+	fi
+
 	test -z "$tasks" && exit 1
-	if [ "$tasks" -eq 1 ]; then
+	if [ "$tasks" -eq $stop_on ]; then
 
-		runlevel="$(runlevel ${vps_utmp})"
+		runlevel="$(runlevel utmp)"
 		lxc_log "$name runlevel $runlevel"
 
 		case $runlevel in
 		N*)
 			# nothing for new boot state
 		;;
-		??0)
+		??0|unknown)
 			lxc_log "$name halt"
 			lxc-stop -n "${name}"
 			lxc-wait -n ${name} -s STOPPED
@@ -164,11 +192,11 @@
 		;;
 		esac
 	else
-		lxc_log "$name $tasks tasks"
+		lxc_log "$name $tasks tasks $sulogins console"
 	fi
 
 	# time of 5 minutes on it JUST IN CASE...
-	inotifywait -qqt 300 ${vps_utmp}
+	inotifywait -qqt 300 utmp
 done
 
 lxc_log "$name watchdog exited"