X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=recepies%2Flxc%2Flxc-watchdog.sh;h=a68d33bb1ac055acba840e723751d54c8fc3db22;hb=132f2c88b2fb189b6fc60334792e125d470ee8d6;hp=0218bb12331b779c81cb9df26ca6f798de92ef77;hpb=b883d7dbc7c81a804a66508edf675aaf10aa3030;p=sysadmin-cookbook

diff --git a/recepies/lxc/lxc-watchdog.sh b/recepies/lxc/lxc-watchdog.sh
index 0218bb1..a68d33b 100755
--- a/recepies/lxc/lxc-watchdog.sh
+++ b/recepies/lxc/lxc-watchdog.sh
@@ -44,8 +44,10 @@ lxc_rootfs() {
 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)"
+		echo "$name $status $boot $(lxc_rootfs $name) $ip $hostname"
 	done ) | column -t
 }
 
@@ -57,7 +59,10 @@ cleanup_init_scripts() {
 		$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
 }
 
 
@@ -68,7 +73,7 @@ setup_inittab() {
 
 	# 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}
@@ -106,6 +111,12 @@ lxc_stop() {
 
 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"