extract ip from config file

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

diff --git a/recepies/lxc/lxc-watchdog.sh b/recepies/lxc/lxc-watchdog.sh
index d2dc43e..90c162f 100755 (executable)
--- a/recepies/lxc/lxc-watchdog.sh
+++ b/recepies/lxc/lxc-watchdog.sh
@@ -46,6 +46,7 @@ lxc_status() {
                boot="-"
                hostname=`cat $(lxc_rootfs $name)/etc/hostname`
                ip=`grep address $(lxc_rootfs $name)/etc/network/interfaces | sed 's/.*address //'`
+               test -z "$ip" && ip=`grep lxc.network.ipv4 /var/lib/lxc/narada/config | cut -d= -f2`
                test -s /var/lib/lxc/$name/on_boot && boot="boot"
                echo "$name $status $boot $(lxc_rootfs $name) $ip $hostname"
        done ) | column -t
@@ -61,6 +62,8 @@ cleanup_init_scripts() {
                $rootfs/etc/rc?.d/*hwclock* \
                $rootfs/etc/rc?.d/*udev* \
        2>/dev/null | xargs -i rm -v {}
+
+       echo $1 > $rootfs/etc/hostname
 }
 
 
@@ -71,7 +74,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}
@@ -109,6 +112,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"