--- recepies/lxc/lxc-watchdog.sh	2010/05/26 10:19:05	216
+++ recepies/lxc/lxc-watchdog.sh	2011/01/25 14:40:42	235
@@ -40,14 +40,24 @@
 	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
 		boot="-"
-		hostname=`cat $(lxc_rootfs $name)/etc/hostname`
-		ip=`grep address $(lxc_rootfs $name)/etc/network/interfaces | sed 's/.*address //'`
 		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
 }
 
@@ -56,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
 }
 
 
@@ -70,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}
@@ -108,6 +123,12 @@
 
 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
 		lxc_log "$name start"