From 132f2c88b2fb189b6fc60334792e125d470ee8d6 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Tue, 7 Sep 2010 16:02:12 +0000 Subject: [PATCH] don't try to start containers without rootfs mounted git-svn-id: svn://svn.rot13.org/sysadmin-cookbook@227 191e9f34-6774-4a6d-acfc-7664dacd4a2a --- recepies/lxc/lxc-watchdog.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recepies/lxc/lxc-watchdog.sh b/recepies/lxc/lxc-watchdog.sh index fb5a173..a68d33b 100755 --- a/recepies/lxc/lxc-watchdog.sh +++ b/recepies/lxc/lxc-watchdog.sh @@ -73,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} @@ -111,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" -- 2.20.1