Commit 9150ebac authored by Maria Matejka's avatar Maria Matejka

Snapshot fixes, more verbose output

parent cfd18839
......@@ -65,7 +65,7 @@ until [ -x /mnt/nfs/rc.local ]; do
sleep 1
done
/mnt/nfs/rc.local
/mnt/nfs/rc.local > /tmp/rc-local-log 2>/tmp/rc-local-err
EOC
chmod +x /etc/rc.local
EOF
......
......@@ -9,6 +9,15 @@ if [ -z "$NAME" ]; then
exit 2
fi
if [ "$NAME" = "-m" ]; then
set -e
for N in "$@"; do
echo Starting "$N"
$0 "$N"
done
exit 0
fi
if [ -e $ROOT/run/$NAME.pid ]; then
echo -n "Host $NAME pidfile found"
if [ -d /proc/$(<$ROOT/run/$NAME.pid) ]; then
......
......@@ -9,6 +9,15 @@ if [ -z "$NAME" ]; then
exit 2
fi
if [ "$NAME" = "-m" ]; then
set -e
for N in "$@"; do
echo Stopping "$N"
$0 "$N"
done
exit 0
fi
function ok() {
echo
rm -f $ROOT/run/$NAME.sock $ROOT/run/$NAME.pid
......
......@@ -61,7 +61,7 @@ function hostdefaults() {
if [ -z "${CONF[$HOSTNAME;IMAGE]}" ]; then echo "Error: Image not set"; return 1; fi
if [ -z "${CONF[$HOSTNAME;ARCH]}" ]; then CONF[$HOSTNAME;ARCH]=x86_64; fi
if [ -z "${CONF[$HOSTNAME;MEMORY]}" ]; then CONF[$HOSTNAME;MEMORY]=64M; fi
if [ "${CONF[$HOSTNAME;COW]^^}" = "YES" ]; then CONF[$HOSTNAME;COW]=-snapshot; else CONF[$HOSTNAME;COW]=; fi
if [ "${CONF[$HOSTNAME;COW]^^}" = "YES" ] || [ "${CONF[$HOSTNAME;COW]}" = "-snapshot" ]; then CONF[$HOSTNAME;COW]=-snapshot; else CONF[$HOSTNAME;COW]=; fi
hostctlnet $HOSTNAME
......
......@@ -54,43 +54,95 @@ Copy debian8 minidebian
Host minidebian
Memory 192M
Copy minidebian md1111 md1112 md1121 md1122 md1211 md1212 md1221 md1222 md2111 md2112 md2121 md2122 md2211 md2212 md2221 md2222
Link dl1113 md1111 10.1.11.11/32 md1112 10.1.11.12/32
Link dl1123 md1121 10.1.12.11/32 md1122 10.1.12.12/32
Link dl1213 md1211 10.1.21.11/32 md1212 10.1.21.12/32
Link dl1223 md1221 10.1.22.11/32 md1222 10.1.22.12/32
Link dl2113 md2111 10.2.11.11/32 md2112 10.2.11.12/32
Link dl2123 md2121 10.2.12.11/32 md2122 10.2.12.12/32
Link dl2213 md2211 10.2.21.11/32 md2212 10.2.21.12/32
Link dl2223 md2221 10.2.22.11/32 md2222 10.2.22.12/32
Link dl1131 md1111 10.1.11.21/32 md1121 10.1.11.22/32
Link dl1132 md1112 10.1.12.21/32 md1122 10.1.12.22/32
Link dl1231 md1211 10.1.21.21/32 md1221 10.1.21.22/32
Link dl1232 md1212 10.1.22.21/32 md1222 10.1.22.22/32
Link dl2131 md2111 10.2.11.21/32 md2121 10.2.11.22/32
Link dl2132 md2112 10.2.12.21/32 md2122 10.2.12.22/32
Link dl2231 md2211 10.2.21.21/32 md2221 10.2.21.22/32
Link dl2232 md2212 10.2.22.21/32 md2222 10.2.22.22/32
Link dl1311 md1111 10.1.11.31/32 md1211 10.1.11.32/32
Link dl1312 md1112 10.1.12.31/32 md1212 10.1.12.32/32
Link dl1321 md1121 10.1.21.31/32 md1221 10.1.21.32/32
Link dl1322 md1122 10.1.22.31/32 md1222 10.1.22.32/32
Link dl2311 md2111 10.2.11.31/32 md2211 10.2.11.32/32
Link dl2312 md2112 10.2.12.31/32 md2212 10.2.12.32/32
Link dl2321 md2121 10.2.21.31/32 md2221 10.2.21.32/32
Link dl2322 md2122 10.2.22.31/32 md2222 10.2.22.32/32
Link dl3111 md1111 10.1.11.41/32 md2111 10.1.11.42/32
Link dl3112 md1112 10.1.12.41/32 md2112 10.1.12.42/32
Link dl3121 md1121 10.1.21.41/32 md2121 10.1.21.42/32
Link dl3122 md1122 10.1.22.41/32 md2122 10.1.22.42/32
Link dl3211 md1211 10.2.11.41/32 md2211 10.2.11.42/32
Link dl3212 md1212 10.2.12.41/32 md2212 10.2.12.42/32
Link dl3221 md1221 10.2.21.41/32 md2221 10.2.21.42/32
Link dl3222 md1222 10.2.22.41/32 md2222 10.2.22.42/32
Copy openbsd58 miniob
Host miniob
Memory 192M
Copy minidebian mov
Host mov
VNC 5
Copy freebsd10 minifb
Host minifb
Memory 192M
#Copy minidebian md1111 md1112 md1121 md1122 md1211 md1212 md1221 md1222 md2111 md2112 md2121 md2122 md2211 md2212 md2221 md2222
Copy minidebian md1111 md1122 md1221 md2112 md2211 md2222
Copy miniob md1112 md1211 md1222 md2121 md2212
Copy minifb md1121 md1212 md2111 md2122 md2221
Net xxx md1111 10.200.1.50/24 md1112 10.200.1.51/24 md1121 10.200.1.52/24 md1122 10.200.1.53/24 md1211 10.200.1.54/24 md1212 10.200.1.55/24 md1221 10.200.1.56/24 md1222 10.200.1.57/24 md2111 10.200.1.58/24 md2112 10.200.1.59/24 md2121 10.200.1.60/24 md2122 10.200.1.61/24 md2211 10.200.1.62/24 md2212 10.200.1.63/24 md2221 10.200.1.64/24 md2222 10.200.1.65/24
Link dl1113 md1111 10.200.0.50/32 md1112 10.200.0.51/32
Link dl1123 md1121 10.200.0.52/32 md1122 10.200.0.53/32
Link dl1213 md1211 10.200.0.54/32 md1212 10.200.0.55/32
Link dl1223 md1221 10.200.0.56/32 md1222 10.200.0.57/32
Link dl2113 md2111 10.200.0.58/32 md2112 10.200.0.59/32
Link dl2123 md2121 10.200.0.60/32 md2122 10.200.0.61/32
Link dl2213 md2211 10.200.0.62/32 md2212 10.200.0.63/32
Link dl2223 md2221 10.200.0.64/32 md2222 10.200.0.65/32
Link dl1131 md1111 10.200.0.50/32 md1121 10.200.0.52/32
Link dl1132 md1112 10.200.0.51/32 md1122 10.200.0.53/32
Link dl1231 md1211 10.200.0.54/32 md1221 10.200.0.56/32
Link dl1232 md1212 10.200.0.55/32 md1222 10.200.0.57/32
Link dl2131 md2111 10.200.0.58/32 md2121 10.200.0.60/32
Link dl2132 md2112 10.200.0.59/32 md2122 10.200.0.61/32
Link dl2231 md2211 10.200.0.62/32 md2221 10.200.0.64/32
Link dl2232 md2212 10.200.0.63/32 md2222 10.200.0.65/32
Link dl1311 md1111 10.200.0.50/32 md1211 10.200.0.54/32
Link dl1312 md1112 10.200.0.51/32 md1212 10.200.0.55/32
Link dl1321 md1121 10.200.0.52/32 md1221 10.200.0.56/32
Link dl1322 md1122 10.200.0.53/32 md1222 10.200.0.57/32
Link dl2311 md2111 10.200.0.58/32 md2211 10.200.0.62/32
Link dl2312 md2112 10.200.0.59/32 md2212 10.200.0.63/32
Link dl2321 md2121 10.200.0.60/32 md2221 10.200.0.64/32
Link dl2322 md2122 10.200.0.61/32 md2222 10.200.0.65/32
Link dl3111 md1111 10.200.0.50/32 md2111 10.200.0.58/32
Link dl3112 md1112 10.200.0.51/32 md2112 10.200.0.59/32
Link dl3121 md1121 10.200.0.52/32 md2121 10.200.0.60/32
Link dl3122 md1122 10.200.0.53/32 md2122 10.200.0.61/32
Link dl3211 md1211 10.200.0.54/32 md2211 10.200.0.62/32
Link dl3212 md1212 10.200.0.55/32 md2212 10.200.0.63/32
Link dl3221 md1221 10.200.0.56/32 md2221 10.200.0.64/32
Link dl3222 md1222 10.200.0.57/32 md2222 10.200.0.65/32
Copy minidebian cxa11 cxa21 cxa22 cxa23 cxa31
Copy minidebian cxb11 cxb21 cxb22 cxb23 cxb31
Copy minidebian cxc11 cxc21 cxc22 cxc23 cxc31
Copy minidebian cxiab cxibc cxica
Link lxa211 cxa11 10.10.1.11/32 cxa21 10.10.1.21/32
Link lxa221 cxa11 10.10.1.11/32 cxa22 10.10.1.22/32
Link lxa231 cxa11 10.10.1.11/32 cxa23 10.10.1.23/32
Link lxa213 cxa31 10.10.1.31/32 cxa21 10.10.1.21/32
Link lxa223 cxa31 10.10.1.31/32 cxa22 10.10.1.22/32
Link lxa233 cxa31 10.10.1.31/32 cxa23 10.10.1.23/32
Link lxb211 cxb11 10.10.2.11/32 cxb21 10.10.2.21/32
Link lxb221 cxb11 10.10.2.11/32 cxb22 10.10.2.22/32
Link lxb231 cxb11 10.10.2.11/32 cxb23 10.10.2.23/32
Link lxb213 cxb31 10.10.2.31/32 cxb21 10.10.2.21/32
Link lxb223 cxb31 10.10.2.31/32 cxb22 10.10.2.22/32
Link lxb233 cxb31 10.10.2.31/32 cxb23 10.10.2.23/32
Link lxc211 cxc11 10.10.3.11/32 cxc21 10.10.3.21/32
Link lxc221 cxc11 10.10.3.11/32 cxc22 10.10.3.22/32
Link lxc231 cxc11 10.10.3.11/32 cxc23 10.10.3.23/32
Link lxc213 cxc31 10.10.3.31/32 cxc21 10.10.3.21/32
Link lxc223 cxc31 10.10.3.31/32 cxc22 10.10.3.22/32
Link lxc233 cxc31 10.10.3.31/32 cxc23 10.10.3.23/32
Link lxiaba cxiab 10.10.0.3/32 cxa11 10.10.1.11/32
Link lxiabb cxiab 10.10.0.3/32 cxb11 10.10.2.11/32
Link lxibcb cxibc 10.10.0.1/32 cxb11 10.10.2.11/32
Link lxibcc cxibc 10.10.0.1/32 cxc11 10.10.3.11/32
Link lxicac cxica 10.10.0.2/32 cxc11 10.10.3.11/32
Link lxicaa cxica 10.10.0.2/32 cxa11 10.10.1.11/32
#Net cxiab 10.10.0.3/28 cxibc 10.10.0.1/28 cxica 10.10.0.2/28
#Net md1 192.168.1.1/24 md2 192.168.1.2/24 md3 192.168.1.3/24 md4 192.168.1.4/24 md5 192.168.1.5/24 md6 192.168.1.6/24
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment