Skip to content

Fix Windows build machine setup on recent versions #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eric-ch merged 1 commit into from
Sep 24, 2019
Merged

Fix Windows build machine setup on recent versions #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build-scripts/windows/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion windows/mkbuildserver.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down