From 24808096ca54f063977ca0611b9b150f7342a463 Mon Sep 17 00:00:00 2001
From: Greg Steuck <blackgnezdo@gmail.com>
Date: Sun, 28 Oct 2018 02:18:59 -0700
Subject: tools/create-openbsd*sh: use cdn.openbsd.org not cloudflare, install
 vmm-firmware

* Use cdn.openbsd.org not cloudflare. Install vmm-firmware explicitly.

* Use cdn.openbsd.org not cloudflare. Install vmm-firmware explicitly.

* set hw.smt=1: the underlying hw on VM is unknown so don't waste SMT.
---
 tools/create-openbsd-gce-ci.sh     | 9 +++++++--
 tools/create-openbsd-vmm-worker.sh | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/create-openbsd-gce-ci.sh b/tools/create-openbsd-gce-ci.sh
index b425ef1ff..e6ff0a92f 100755
--- a/tools/create-openbsd-gce-ci.sh
+++ b/tools/create-openbsd-gce-ci.sh
@@ -10,7 +10,7 @@
 
 set -eu -o pipefail
 
-readonly MIRROR="${MIRROR:-cloudflare.cdn.openbsd.org}"
+readonly MIRROR="${MIRROR:-cdn.openbsd.org}"
 readonly VERSION="${VERSION:-6.4}"
 readonly DOWNLOAD_VERSION="${DOWNLOAD_VERSION:-snapshots}"
 readonly RELNO="${2:-${VERSION/./}}"
@@ -32,7 +32,8 @@ cat >install.site <<EOF
 syspatch
 PKGS="bash git gmake go llvm nano wget"
 PKG_PATH=https://${MIRROR}/pub/OpenBSD/${DOWNLOAD_VERSION}/packages/${ARCH}/ pkg_add -I \$PKGS
-PKG_PATH= pkg_info -I \$PKGS && echo pkg_add OK
+PKG_PATH=http://firmware.openbsd.org/firmware/snapshots/ pkg_add vmm-firmware
+PKG_PATH= pkg_info -I \$PKGS vmm-firmware && echo pkg_add OK
 
 echo 'set tty com0' > boot.conf
 echo 'PasswordAuthentication no' >> /etc/ssh/sshd_config
@@ -86,6 +87,10 @@ vm "syzkaller" {
 }
 EOF
 
+cat >etc/sysctl.conf <<EOF
+hw.smt=1
+EOF
+
 tar --owner=root --group=root -zcvf site${RELNO}.tgz install.site etc/*
 
 # Autoinstall script.
diff --git a/tools/create-openbsd-vmm-worker.sh b/tools/create-openbsd-vmm-worker.sh
index ebc2d4c02..cce3ad8ef 100755
--- a/tools/create-openbsd-vmm-worker.sh
+++ b/tools/create-openbsd-vmm-worker.sh
@@ -10,7 +10,7 @@
 
 set -eu -o pipefail
 
-readonly MIRROR="${MIRROR:-cloudflare.cdn.openbsd.org}"
+readonly MIRROR="${MIRROR:-cdn.openbsd.org}"
 readonly VERSION="${VERSION:-6.4}"
 readonly DOWNLOAD_VERSION="${DOWNLOAD_VERSION:-snapshots}"
 readonly RELNO="${2:-${VERSION/./}}"
-- 
cgit mrf-deployment