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

diff --git a/recepies/lxc/lxc-watchdog.sh b/recepies/lxc/lxc-watchdog.sh
index 0218bb1..93ffcfe 100755
--- a/recepies/lxc/lxc-watchdog.sh
+++ b/recepies/lxc/lxc-watchdog.sh
@@ -40,12 +40,24 @@ lxc_rootfs() {
 	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="-"
 		test -s /var/lib/lxc/$name/on_boot && boot="boot"
-		echo "$name $status $boot $(lxc_rootfs $name)"
+		echo "$name $status $boot $(lxc_rootfs $name) $(lxc_ip $name) $(lxc_hostname $name)"
 	done ) | column -t
 }
 
@@ -54,10 +66,16 @@ cleanup_init_scripts() {
 	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
 }
 
 
@@ -68,7 +86,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,9 +124,17 @@ 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"
+		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
@@ -123,8 +149,14 @@ rootfs=$(lxc_rootfs $1)
 while true; do
 	vps_utmp=${rootfs}/var/run/utmp
 	tasks=`wc -l < /cgroup/${name}/tasks`
+	stop_on=1 # init
+	sulogins=`lxc-ps --name backuppc | 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})"
 		lxc_log "$name runlevel $runlevel"
@@ -152,7 +184,7 @@ while true; do
 		;;
 		esac
 	else
-		lxc_log "$name $tasks tasks"
+		lxc_log "$name $tasks tasks $sulogins console"
 	fi
 
 	# time of 5 minutes on it JUST IN CASE...