From 6419afbb779b26af853b46d8ad79cfe52b6f7805 Mon Sep 17 00:00:00 2001
From: Greg Steuck <blackgnezdo@gmail.com>
Date: Tue, 27 Nov 2018 04:14:06 -0800
Subject: openbsd: run on gce

* build/openbsd: minor cleanup (use tuples instead of maps)

* Grammar nits in comments.

* Simplify openbsd.Create, will defer when there's more than one error exit.

* pkg/build: Support copying kernel into GCE image

* Simple test for openbsd image copy build.

* Cleanup in case something failed before.

* Support multi-processor VMs on GCE.

* More debug

* Reformat

* OpenBSD gce image needs to be raw.

* GC

* Force format to GNU directly on Go 1.10 or newer.

* Use vmType passed as a parameter inside openbsd.go

* gofmt

* more fmt

* Can't use GENERIC.mp just yet.

* capitalize

* Copyright
---
 tools/create-openbsd-vmm-worker.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tools/create-openbsd-vmm-worker.sh')

diff --git a/tools/create-openbsd-vmm-worker.sh b/tools/create-openbsd-vmm-worker.sh
index cce3ad8ef..1baa3c687 100755
--- a/tools/create-openbsd-vmm-worker.sh
+++ b/tools/create-openbsd-vmm-worker.sh
@@ -41,6 +41,10 @@ perl -i.bak -pne 's/^(ttyC.*)vt220.*/$1unknown off/' /etc/ttys
 touch root/.hushlogin home/syzkaller/.hushlogin
 EOF
 
+cat >etc/sysctl.conf <<EOF
+hw.smt=1
+EOF
+
 cat >etc/installurl <<EOF
 https://${MIRROR}/pub/OpenBSD
 EOF
@@ -108,15 +112,15 @@ growisofs -M "${ISO_PATCHED}" -l -R -graft-points \
   /etc/random.seed=random.seed
 
 # Initialize disk image.
-rm -f worker_disk.qcow2
-qemu-img create -f qcow2 worker_disk.qcow2 1G
+rm -f worker_disk.raw
+qemu-img create -f raw worker_disk.raw 1G
 
 # Run the installer to create the disk image.
 expect 2>&1 <<EOF | tee install_log
 set timeout 1800
 
 spawn qemu-system-x86_64 -nographic -smp 2 \
-  -drive if=virtio,file=worker_disk.qcow2,format=qcow2 -cdrom "${ISO_PATCHED}" \
+  -drive if=virtio,file=worker_disk.raw,format=raw -cdrom "${ISO_PATCHED}" \
   -net nic,model=virtio -net user -boot once=d -m 4000 -enable-kvm
 
 expect timeout { exit 1 } "boot>"
@@ -165,5 +169,5 @@ expect {
 EOF
 
 cat <<EOF
-Done: worker_disk.qcow2
+Done: worker_disk.raw
 EOF
-- 
cgit mrf-deployment