freedos fix - boot problems needed smm on

2022-03-07 12:14:19 +00:00 · 2022-03-07 12:14:19 +00:00 · 4099ff8497
commit 4099ff8497
parent e88dfc8e5f
1 changed files with 4 additions and 0 deletions
--- a/4
+++ b/4
@ -477,7 +477,11 @@ function vm_boot() {
      fi

      if [ "${guest_os}" == "freedos" ] ; then
+<<<<<<< HEAD
        # fix for #382
+=======
+        # fix for booting issue discussed in #382
+>>>>>>> eb67e14 (freedos fix - boot problems needed smm on)
        SMM="on"
      fi