don't try to start containers without rootfs mounted

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

diff --git a/recepies/lxc/lxc-watchdog.sh b/recepies/lxc/lxc-watchdog.sh
index 435e1a2..a68d33b 100755 (executable)
--- a/recepies/lxc/lxc-watchdog.sh
+++ b/recepies/lxc/lxc-watchdog.sh
@@ -37,16 +37,18 @@ 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_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="-"
+               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)"
-       done
+               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"