From 764cd45f64a483e3b5415df2b5761c8ac8101149 Mon Sep 17 00:00:00 2001
From: Jed <lejosnej@ainfosec.com>
Date: Fri, 20 Sep 2019 11:35:40 -0400
Subject: [PATCH] Fix Windows build machine setup on recent versions

virt-install is now (as of Debian Buster) stricter about VM options.
Added the missing params to make it happy.
Also the latest Windows 10 rejects "''" for the empty string argument
of ssh-keygen, and expects '""' instead, which actually makes sense.

Signed-off-by: Jed <lejosnej@ainfosec.com>
---
 build-scripts/windows/setup.sh | 3 ++-
 windows/mkbuildserver.ps1      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-scripts/windows/setup.sh b/build-scripts/windows/setup.sh
index ecf442a82..c1df8ba91 100755
--- a/build-scripts/windows/setup.sh
+++ b/build-scripts/windows/setup.sh
@@ -79,9 +79,10 @@ apt-get install qemu-kvm virtinst
 
 virt-install \
     --virt-type kvm \
+    --boot hd,cdrom \
     --name ${vm_name} \
     --memory 2048 \
-    --disk /home/${BUILD_USER}/windows/${disk_pool}/disk,bus=virtio,size=80 \
+    --disk /home/${BUILD_USER}/windows/${disk_pool}/disk,format=raw,bus=virtio,size=80 \
     --disk /home/${BUILD_USER}/windows/win.iso,device=cdrom,bus=ide \
     --disk /home/${BUILD_USER}/windows/tools.iso,device=cdrom,bus=ide \
     -w bridge=${BUILD_USER}br0,mac=${MAC_ADDR},model=virtio \
diff --git a/windows/mkbuildserver.ps1 b/windows/mkbuildserver.ps1
index d367a9f45..d59b7d282 100644
--- a/windows/mkbuildserver.ps1
+++ b/windows/mkbuildserver.ps1
@@ -67,7 +67,7 @@ copy BuildDaemon\winbuildd.bat "$($startup)\winbuildd.bat"
 # Create ssh key
 $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine")
 cd C:\winbuildd
-ssh-keygen -t rsa -N "''" -f id_rsa
+ssh-keygen -t rsa -N '""' -f id_rsa
 
 # Done
 Write-Host "Done. Please reboot one last time."