--- recepies/lxc/lxc-watchdog.sh	2010/03/16 23:05:31	189
+++ recepies/lxc/lxc-watchdog.sh	2010/10/24 12:23:20	233
@@ -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,27 @@
 
 
 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 | cut -d= -f2 || \
+	grep address $(lxc_rootfs $name)/etc/network/interfaces | sed 's/.*address //' ) | \
+	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
-		boot="    "
+	( 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)"
-	done
+		echo "$name $status $boot $(lxc_rootfs $name) $(lxc_ip $name) $(lxc_hostname $name)"
+	done ) | column -t
 }
 
 
@@ -53,7 +68,11 @@
 		$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 +83,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}
@@ -102,6 +121,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"
@@ -160,6 +185,11 @@
 }
 
 
+usage() {
+	echo "Usage: $0 {start|stop|restart|status|boot|disable} [name name ... ]" >&2
+	exit 3
+}
+
 command_on_lxc() {
 command=$1
 shift
@@ -171,8 +201,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 ) &
@@ -194,8 +225,7 @@
 	echo -n > /var/lib/lxc/$1/on_boot
 	;;
 *)
-	echo "Usage: $0 {start|stop|restart|status}" >&2
-	exit 3
+	usage
 	;;
 
 esac
@@ -203,9 +233,9 @@
 }
 
 command=$1
-shift
-
+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