qemu tap coniguration hell

1 files changed, 19 insertions, 23 deletions

diff --git a/os-plugins/plugins/virtualbox/files/run-virt.include b/os-plugins/plugins/virtualbox/files/run-virt.include
index abf1e0be..2a0b84a2 100644
--- a/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -212,29 +212,25 @@ esac
 # translate boot, use if set else set to HardDisk
 # usually support for a,c,d,n, stands for Floppy, HD, CD-ROM, Network
 # support nfs and tftp as well
-if [ -n "${boot}" ]; then
-  case ${boot} in
-    n*|tftp)
-      boot="Network"
-      if [ "${network_kind}" = "NAT" ] && [ -n "${virtualbox_tftpdir}" ]; then
-        # remove spaces from VM name to avoid Problems /w TFTP in NAT
-        vm_name=$(echo ${vm_name} | sed -e "s, ,-,g")
-        # link TFTP dir for NAT TFTP boots
-        mkdir -p ${confdir}/TFTP
-        cp ${virtualbox_tftpdir}/pxelinux.0 ${confdir}/TFTP/${vm_name}.pxe
-        for i in $(ls ${virtualbox_tftpdir}); do
-          ln -sf ${virtualbox_tftpdir}/${i} ${confdir}/TFTP/${i}
-        done
-      fi
-    ;;
-    # later maybe c|disk|hd*|sd*) for HD and d|cd*) for CD-ROM
-    *) 
-      boot="HardDisk"
-    ;;
-  esac
-else
-  boot="HardDisk"
-fi
+case ${boot} in
+  n*|tftp)
+    boot="Network"
+    if [ "${network_kind}" = "NAT" ] && [ -n "${virtualbox_tftpdir}" ]; then
+      # remove spaces from VM name to avoid Problems /w TFTP in NAT
+      vm_name=$(echo ${vm_name} | sed -e "s, ,-,g")
+      # link TFTP dir for NAT TFTP boots
+      mkdir -p ${confdir}/TFTP
+      cp ${virtualbox_tftpdir}/pxelinux.0 ${confdir}/TFTP/${vm_name}.pxe
+      for i in $(ls ${virtualbox_tftpdir}); do
+        ln -sf ${virtualbox_tftpdir}/${i} ${confdir}/TFTP/${i}
+      done
+    fi
+  ;;
+  # later maybe c|disk|hd*|sd*) for HD and d|cd*) for CD-ROM
+  *) 
+    boot="HardDisk"
+  ;;
+esac
 
 # external GUI
 vrdpport="590${VM_ID}"