fix console condition, restart now works

[sysadmin-cookbook] / recepies / lxc / lxc-watchdog.sh

diff --git a/recepies/lxc/lxc-watchdog.sh b/recepies/lxc/lxc-watchdog.sh
index 8c3a77d..d7f26a4 100755 (executable)
--- a/recepies/lxc/lxc-watchdog.sh
+++ b/recepies/lxc/lxc-watchdog.sh
@@ -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,28 @@ lxc_exists() {
 
 
 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 | 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() {
-       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
 }
 
 
@@ -50,10 +66,15 @@ 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* \
        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 +85,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}
@@ -102,6 +123,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"
@@ -119,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"
@@ -148,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...
@@ -160,6 +193,11 @@ lxc_log "$name watchdog exited"
 }
 
 
+usage() {
+       echo "Usage: $0 {start|stop|restart|status|boot|disable} [name name ... ]" >&2
+       exit 3
+}
+
 command_on_lxc() {
 command=$1
 shift
@@ -171,8 +209,9 @@ case "$command" in
 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 +233,7 @@ disable)
        echo -n > /var/lib/lxc/$1/on_boot
        ;;
 *)
-       echo "Usage: $0 {start|stop|restart|status}" >&2
-       exit 3
+       usage
        ;;
 
 esac
@@ -203,9 +241,9 @@ esac
 }
 
 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