Commit 8b5e9b14 authored by Maria Jan Matejka's avatar Maria Jan Matejka

birdlab updates

parent 0d31553a
No preview for this file type
......@@ -146,7 +146,7 @@ echo -e "hostname $HOSTNAME\nexport HOSTNAME=$HOSTNAME" > $ROOT/nfs/net/hostname
$ROOT/bin/omapi add $NAME $HOSTMAC $HOSTIP4
qemu-system-$HOSTARCH -enable-kvm -m $HOSTMEMORY -hda $ROOT/img/$HOSTIMAGE $HOSTCOW -display none ${HOSTVNCID:+-vnc 10.0.0.11:$HOSTVNCID} -netdev tap,id=ctl,ifname=$HOSTTAP,script=no -device e1000,netdev=ctl,mac=$HOSTMAC $HOSTNICDEV -pidfile $ROOT/run/$NAME.pid -monitor unix:$ROOT/run/$NAME.sock,server,nowait -serial unix:$ROOT/run/$NAME.serial,server,nowait -daemonize $INSTALL "$@"
qemu-system-$HOSTARCH -enable-kvm -m $HOSTMEMORY -hda $ROOT/img/$HOSTIMAGE $HOSTCOW -display none ${HOSTVNCID:+-vnc 172.20.20.180:$HOSTVNCID} -netdev tap,id=ctl,ifname=$HOSTTAP,script=no -device e1000,netdev=ctl,mac=$HOSTMAC $HOSTNICDEV -pidfile $ROOT/run/$NAME.pid -monitor unix:$ROOT/run/$NAME.sock,server,nowait -serial unix:$ROOT/run/$NAME.serial,server,nowait -daemonize $INSTALL "$@"
#-runas $VIRTUSER
ip link set $HOSTTAP up
......
......@@ -60,6 +60,7 @@ function wait_pidfile() {
}
SOCAT=$ROOT/bin/socat
#SOCAT=$(which socat)
declare -A HOSTS
declare -A CONF
......
......@@ -64,18 +64,30 @@ Host debian8
Type linux
Cow yes
Host debian5-install
Image debian5
Host debian7-install
Image debian7
Memory 512M
VNC 12
Type linux
Host debian5
Image debian5
Host debian7
Image debian7
Memory 512M
Type linux
Cow yes
Host centos6-install
Image centos6
Memory 512M
VNC 13
Type linux
Host centos6
Image centos6
Memory 512M
Type linux
Cow yes
Host centos7-install
Image centos7
Memory 512M
......
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