--- recepies/lxc/lxc-watchdog.sh	2010/03/16 22:00:20	188
+++ recepies/lxc/lxc-watchdog.sh	2011/01/25 14:40:42	235
@@ -16,6 +16,10 @@
 #
 # 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
@@ -33,16 +37,28 @@
 
 
 lxc_rootfs() {
-	grep lxc.rootfs "/var/lib/lxc/$1/config" | cut -d= -f2 | sed 's/^ *//'
+	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() {
-	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
+	( 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
+		boot="-"
+		test -s /var/lib/lxc/$name/on_boot && boot="boot"
+		echo "$name $status $boot $(lxc_rootfs $name) $(lxc_ip $name) $(lxc_hostname $name)"
+	done ) | column -t
 }
 
 
@@ -50,10 +66,15 @@
 	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* \
 	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
 }
 
 
@@ -64,7 +85,7 @@
 
 	# let container respond to kill -SIGPWR
 	inittab=$rootfs/etc/inittab
-	if ! grep "$add" ${inittab} >/dev/null ; then
+	if test -e $inittab && ! grep "$add" ${inittab} >/dev/null ; then
 		grep -v "$remove" ${inittab} > ${inittab}.new
 		echo $add >> ${inittab}.new
 		mv ${inittab}.new ${inittab}
@@ -73,6 +94,11 @@
 }
 
 
+lxc_log() {
+	echo `date +%Y-%m-%dT%H:%M:%S` $*
+}
+
+
 lxc_kill() {
 	name=$1
 	sig=$2
@@ -82,22 +108,30 @@
 		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
 }
 
 
 lxc_start() {
 	name=$1
+	rootfs=$(lxc_rootfs $1)
+
+	if [ ! -e $rootfs ] ; then
+		echo "ERROR $name rootfs $rootfs not found"
+		return
+	fi
 
 	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
@@ -105,10 +139,6 @@
 	fi
 }
 
-lxc_log() {
-	echo `date +%Y-%m-%dT%H:%M:%S` $*
-}
-
 lxc_watchdog() {
 name=$1
 rootfs=$(lxc_rootfs $1)
@@ -152,11 +182,16 @@
 	inotifywait -qqt 300 ${vps_utmp}
 done
 
-lxc_log "$name exited"
+lxc_log "$name watchdog exited"
 
 }
 
 
+usage() {
+	echo "Usage: $0 {start|stop|restart|status|boot|disable} [name name ... ]" >&2
+	exit 3
+}
+
 command_on_lxc() {
 command=$1
 shift
@@ -168,8 +203,9 @@
 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"
+	setup_inittab $1 ":respawn:/sbin/getty.*tty1"	"c1:12345:respawn:/sbin/getty 38400 tty1 linux"
+	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 ) &
@@ -191,8 +227,7 @@
 	echo -n > /var/lib/lxc/$1/on_boot
 	;;
 *)
-	echo "Usage: $0 {start|stop|restart|status}" >&2
-	exit 3
+	usage
 	;;
 
 esac
@@ -200,16 +235,20 @@
 }
 
 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`
-		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
-	shift
 	while [ ! -z "$1" ] ; do
 		command_on_lxc $command $1
 		shift