equal
deleted
inserted
replaced
4 |
4 |
5 |
5 |
6 ME=${0##*/} |
6 ME=${0##*/} |
7 NODE=$(uname -n) |
7 NODE=$(uname -n) |
8 KVMTAB=/etc/kvmtab |
8 KVMTAB=/etc/kvmtab |
9 KVM_OPTS_BUILTIN='-drive file=/dev/drbd$ID,if=virtio,index=0,boot=on |
9 KVM_OPTS_BUILTIN=' |
|
10 -vnc 127.0.0.1:$ID |
|
11 -drive file=/dev/drbd$ID,if=virtio,index=0,boot=on |
10 -boot c |
12 -boot c |
11 -m 512 |
13 -m 512 |
12 -net nic,macaddr=$MAC,model=virtio |
14 -net nic,macaddr=$MAC,model=virtio |
13 -net tap,ifname=tap$ID,script=no' |
15 -net tap,ifname=tap$ID,script=no' |
14 |
16 |
15 function die() { echo $0: "$@" >&2; exit 1; } |
17 function die() { echo $0: "$@" >&2; exit 1; } |
16 |
18 |
17 function machine() { |
19 function machine() { |
18 |
20 |
48 test "$KVM_OPTS" || die "$CONFIG should set KVM_OPTS" |
50 test "$KVM_OPTS" || die "$CONFIG should set KVM_OPTS" |
49 else |
51 else |
50 echo "using builtin config" |
52 echo "using builtin config" |
51 KVM_OPTS=$KVM_OPTS_BUILTIN |
53 KVM_OPTS=$KVM_OPTS_BUILTIN |
52 fi |
54 fi |
53 eval KVM_OPTS=\"-name $NAME -vnc :$ID $KVM_OPTS -monitor tcp:127.0.0.1:$MONITOR,server,nowait\" |
55 eval KVM_OPTS=\"-name $NAME $KVM_OPTS -monitor tcp:127.0.0.1:$MONITOR,server,nowait\" |
54 drbdadm primary drbd$ID |
56 drbdadm primary drbd$ID |
55 tunctl -u kvm-$NAME -t tap$ID |
57 tunctl -u kvm-$NAME -t tap$ID |
56 brctl delif br0 tap$ID &> /dev/null || true |
58 brctl delif br0 tap$ID &> /dev/null || true |
57 brctl addif br0 tap$ID &> /dev/null || true |
59 brctl addif br0 tap$ID &> /dev/null || true |
58 ip link set tap$ID up |
60 ip link set tap$ID up |