From 42c78641f53c8e6208bfd1808259f116a7ec71de Mon Sep 17 00:00:00 2001
From: Greg Steuck <gnezdo@google.com>
Date: Thu, 11 Oct 2018 10:32:25 -0700
Subject: tools/create-openbsd*: Support post-version flip snapshots.

  * Fixed pkg_add status checking
  * Switched to qcow2 test image
  * Minor GC
---
 tools/create-openbsd-gce-ci.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools/create-openbsd-gce-ci.sh')

diff --git a/tools/create-openbsd-gce-ci.sh b/tools/create-openbsd-gce-ci.sh
index 1075aac1b..b425ef1ff 100755
--- a/tools/create-openbsd-gce-ci.sh
+++ b/tools/create-openbsd-gce-ci.sh
@@ -26,11 +26,13 @@ if [[ ! -f "${ISO}" ]]; then
 fi
 
 # Create custom siteXX.tgz set.
-mkdir -p etc
+rm -fr etc && mkdir -p etc
 cat >install.site <<EOF
 #!/bin/sh
 syspatch
-pkg_add -I bash git gmake go llvm nano wget && echo pkg_add OK
+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
 
 echo 'set tty com0' > boot.conf
 echo 'PasswordAuthentication no' >> /etc/ssh/sshd_config
-- 
cgit mrf-deployment