projects
/
sysadmin-cookbook
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
39d0ec7
..
a68d33b
100755
(executable)
--- a/
recepies/lxc/lxc-watchdog.sh
+++ b/
recepies/lxc/lxc-watchdog.sh
@@
-59,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/*umountfs \
$rootfs/etc/rc?.d/*umountroot \
$rootfs/etc/rc?.d/*hwclock* \
+ $rootfs/etc/rc?.d/*udev* \
2>/dev/null | xargs -i rm -v {}
2>/dev/null | xargs -i rm -v {}
+
+ echo $1 > $rootfs/etc/hostname
}
}
@@
-70,7
+73,7
@@
setup_inittab() {
# let container respond to kill -SIGPWR
inittab=$rootfs/etc/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}
grep -v "$remove" ${inittab} > ${inittab}.new
echo $add >> ${inittab}.new
mv ${inittab}.new ${inittab}
@@
-108,6
+111,12
@@
lxc_stop() {
lxc_start() {
name=$1
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"
if ! lxc-info -n $name | grep RUNNING ; then
lxc_log "$name start"