From d24eafbd633966f41b9a5b9e81589a1ccb67f94e Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 14 Oct 2022 16:05:35 -0400
Subject: [PATCH] Tweak VirtualBox instructions

---
 README.md   | 29 +++++++++++++++--------------
 Rsconscript |  4 +---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 9035ff2..03a4d7e 100644
--- a/README.md
+++ b/README.md
@@ -23,17 +23,18 @@ To install HOS to an EFI partition, follow these steps:
 To create a VM in VirtualBox:
 
 1. Build HOS ("./rscons").
-2. Create a VirtualBox VMDK image with "./rscons mk-vmdk".
-3. In VirtualBox, select Machine -> New.
-4. Set name to HOS.
-5. Set Type to Other.
-6. Set Version to Other/Unknown (64-bit).
-7. Click Next.
-8. Set memory size to 512 MB.
-9. Click Next.
-10. Select Use an existing virtual hard disk file.
-11. Browse and add the build/hello/HOS.vmdk file.
-12. Click Create.
-13. Open HOS VM settings.
-14. Under System, check the Enable EFI checkbox and click OK.
-15. To run HOS, either start the VM through VirtualBox or with "./rscons run-vb".
+2. In VirtualBox, select Machine -> New.
+3. Set name to HOS.
+4. Set Type to Other.
+5. Set Version to Other/Unknown (64-bit).
+6. Click Next.
+7. Set memory size to 512 MB.
+8. Click Next.
+9. Select Do not add a virtual hard disk.
+10. Click Create.
+11. From the HOS repository, create a VirtualBox VMDK image with "./rscons mk-vmdk".
+12. Move the HOS.vmdk file generated to the HOS VirtualBox folder.
+13. In VirtualBox Manager, open HOS VM settings.
+14. Under System, check the Enable EFI checkbox.
+15. Under Storage, add a hard disk and browse to select the HOS.vmdk file.
+16. To run HOS, either start the VM through VirtualBox or with "./rscons run-vb".
diff --git a/Rsconscript b/Rsconscript
index 2459043..5ad3ac8 100644
--- a/Rsconscript
+++ b/Rsconscript
@@ -149,9 +149,7 @@ end
 
 # See README.md for how to set up VirtualBox for HOS.
 task "mk-vmdk", desc: "Create VirtualBox VMDK virtual drive for HOS" do
-  vmdk = hello_env.expand("^/HOS.vmdk")
-  rm vmdk
-  sh %W[VBoxManage internalcommands createrawvmdk -filename #{vmdk} -rawdisk #{File.expand_path(hello_env.expand("^/HOS.img"))}]
+  sh %W[VBoxManage internalcommands createrawvmdk -filename HOS.vmdk -rawdisk #{File.expand_path(hello_env.expand("^/HOS.img"))}]
 end
 
 # See README.md for how to set up VirtualBox for HOS.