diff options
| author | Michael Janczyk | 2010-04-06 22:28:32 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-04-06 22:28:32 +0200 |
| commit | 32f56a53722d65c785aa1770d191733f2fc9e1f2 (patch) | |
| tree | 977cc5a3acfefa6fb1a61a2dc53f08f14d986570 /os-plugins/plugins/qemukvm/files/run-virt.include | |
| parent | cumulative commit of local branch, xen modifications and vmgrid plugin (diff) | |
| download | core-32f56a53722d65c785aa1770d191733f2fc9e1f2.tar.gz core-32f56a53722d65c785aa1770d191733f2fc9e1f2.tar.xz core-32f56a53722d65c785aa1770d191733f2fc9e1f2.zip | |
changed name of init-hook, qemukvm tun/tap config
Diffstat (limited to 'os-plugins/plugins/qemukvm/files/run-virt.include')
| -rw-r--r-- | os-plugins/plugins/qemukvm/files/run-virt.include | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/os-plugins/plugins/qemukvm/files/run-virt.include b/os-plugins/plugins/qemukvm/files/run-virt.include index be7bc4fb..08a8b4f1 100644 --- a/os-plugins/plugins/qemukvm/files/run-virt.include +++ b/os-plugins/plugins/qemukvm/files/run-virt.include @@ -122,21 +122,18 @@ qemu_ifscr="script=${PLUGINDIRQK}/ifup,downscript=${PLUGINDIRQK}/ifdown" case "${network_kind}" in bridge*) VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=tapbridge${VM_ID},${qemu_ifscr}" - sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapbridge${VM_ID} 2>/dev/null - sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapbridge${VM_ID} \ - 2>/dev/null + sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapbridge${VM_ID} #2>/dev/null + sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapbridge${VM_ID} ;; NAT|nat) VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=tapnat${VM_ID},${qemu_ifscr}" - sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapbnat${VM_ID} 2>/dev/null - sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapnat${VM_ID} \ - 2>/dev/null + sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapnat${VM_ID} + sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapnat${VM_ID} ;; hostonly|host-only) VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=taphost${VM_ID},${qemu_ifscr}" - sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapbhost${VM_ID} 2>/dev/null - sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 taphost${VM_ID} \ - 2>/dev/null + sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t taphost${VM_ID} + sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 taphost${VM_ID} ;; *) network_kind="user" @@ -302,4 +299,5 @@ VIRTCMDOPTSHL="${VIRTCMDOPTS} -nographic ${diskfile}" # graphical start VIRTCMD="$VIRTCMD" # vga std/cirrus/vmware? -VIRTCMDOPTS="${VIRTCMDOPTS} -vga std -full-screen ${diskfile}" +#VIRTCMDOPTS="${VIRTCMDOPTS} -vga std -full-screen ${diskfile}" +VIRTCMDOPTS="${VIRTCMDOPTS} ${diskfile}" |