From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Wed, 26 Jan 2011 12:16:23 +0000 (+0000)
Subject: fix console condition, restart now works
X-Git-Url: http://git.rot13.org/?p=sysadmin-cookbook;a=commitdiff_plain;h=d87c855f158e773a98e501a729c7d66335e889c2;hp=a7099bab4d1d764cd2eb6b82881287fdb6cf1eb7

fix console condition, restart now works

git-svn-id: svn://svn.rot13.org/sysadmin-cookbook@236 191e9f34-6774-4a6d-acfc-7664dacd4a2a
---

diff --git a/recepies/lxc/lxc-watchdog.sh b/recepies/lxc/lxc-watchdog.sh
index da013d8..d7f26a4 100755
--- a/recepies/lxc/lxc-watchdog.sh
+++ b/recepies/lxc/lxc-watchdog.sh
@@ -146,8 +146,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"
@@ -175,7 +181,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...