diff options
| author | root | 2011-01-17 12:10:15 +0100 |
|---|---|---|
| committer | root | 2011-01-17 12:10:15 +0100 |
| commit | e4aedfabe7d586a5633a8be2dcb253b4ac7afca8 (patch) | |
| tree | ac9a4ddbe756f612dc0a7d4b35e7f23a9afc0b8a /src/os-plugins/plugins/qemukvm | |
| parent | remove /proc/bus/usb stuff.. (diff) | |
| download | core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.tar.gz core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.tar.xz core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.zip | |
commit of quickfixes on 4.2
Diffstat (limited to 'src/os-plugins/plugins/qemukvm')
| -rw-r--r-- | src/os-plugins/plugins/qemukvm/files/run-virt.include | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/os-plugins/plugins/qemukvm/files/run-virt.include b/src/os-plugins/plugins/qemukvm/files/run-virt.include index c8b2a82b..a762ec18 100644 --- a/src/os-plugins/plugins/qemukvm/files/run-virt.include +++ b/src/os-plugins/plugins/qemukvm/files/run-virt.include @@ -46,7 +46,7 @@ diskfile=${vmpath} # check the file type if echo ${imgname} | grep -iE "img|qcow|vmdk" >/dev/null 2>&1; then - imgtype=$(echo ${imgname##*.} | tr [a-z] [A-Z]) + imgtype=$(echo ${imgname##*.} | tr "[a-z]" "[A-Z]") else writelog "${imgname} is not a valid image type (img|qcow*|vmdk), exiting!" exit 1 @@ -122,24 +122,24 @@ qemu_ifscr="script=${PLUGINCONFQK}/ifup,downscript=${PLUGINCONFQK}/ifdown" case "${network_kind}" in bridge*) VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=tapbridge${VM_ID},${qemu_ifscr}" - sudo /opt/openslx/rootfs/sbin/tunctl -t tapbridge${VM_ID} -u ${USER} \ + sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapbridge${VM_ID} -u ${USER} \ >/dev/null 2>&1 - sudo /opt/openslx/rootfs/usr/sbin/brctl addif br0 tapbridge${VM_ID} - POSTRUN="/opt/openslx/rootfs/sbin/tunctl -d tapbridge${VM_ID}" + sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapbridge${VM_ID} + POSTRUN="/opt/openslx/uclib-rootfs/sbin/tunctl -d tapbridge${VM_ID}" ;; nat) VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=tapnat${VM_ID},${qemu_ifscr}" - sudo /opt/openslx/rootfs/sbin/tunctl -t tapnat${VM_ID} -u ${USER} \ + sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapnat${VM_ID} -u ${USER} \ >/dev/null 2>&1 - sudo /opt/openslx/rootfs/usr/sbin/brctl addif br0 tapnat${VM_ID} - POSTRUN="/opt/openslx/rootfs/sbin/tunctl -d tapnat${VM_ID}" + sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapnat${VM_ID} + POSTRUN="/opt/openslx/uclib-rootfs/sbin/tunctl -d tapnat${VM_ID}" ;; host*) VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=taphost${VM_ID},${qemu_ifscr}" - sudo /opt/openslx/rootfs/sbin/tunctl -t taphost${VM_ID} -u ${USER} \ + sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t taphost${VM_ID} -u ${USER} \ >/dev/null 2>&1 - sudo /opt/openslx/rootfs/usr/sbin/brctl addif br0 taphost${VM_ID} - POSTRUN="/opt/openslx/rootfs/sbin/tunctl -d taphost${VM_ID}" + sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 taphost${VM_ID} + POSTRUN="/opt/openslx/uclib-rootfs/sbin/tunctl -d taphost${VM_ID}" ;; *) network_kind="user" |