Revert "Merge pull request araujobsd#2 from pkgdemon/patch-1"

This reverts commit 29db2d6, reversing changes made to f1d311d.
iXsystems · Mar 26, 2018 · b37d3a5 · b37d3a5
1 parent 29db2d6
commit b37d3a5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/vm-run b/lib/vm-run
@@ -209,9 +209,9 @@ vm::run(){
 
         # set full iso path
         # use null.iso if not an install and uefi firmware
-        #[ -n "${_iso}" ] && _iso_dev="-s 3:0,ahci-cd,${_iso}"
-        #[ -z "${_iso}" -a -n "${_uefi}" -a "${_uefi}" != "csm" ] && \
-        #    _iso_dev="-s 3:0,ahci-cd,${vm_dir}/.config/null.iso"
+        [ -n "${_iso}" ] && _iso_dev="-s 3:0,ahci-cd,${_iso}"
+        [ -z "${_iso}" -a -n "${_uefi}" -a "${_uefi}" != "csm" ] && \
+            _iso_dev="-s 3:0,ahci-cd,${vm_dir}/.config/null.iso"
 
         # reasonably ugly hack to remove wait option after first run
         [ "${_run}" -eq "2" ] && vm::bhyve_device_fbuf_clear_wait