diff --git a/env/openbsd-amd64/README b/env/openbsd-amd64/README index f54a076c..51b388b3 100644 --- a/env/openbsd-amd64/README +++ b/env/openbsd-amd64/README @@ -1,7 +1,8 @@ make.bash creates a Google Compute Engine VM image to run the Go OpenBSD builder, booting up to run the buildlet. -make.bash should be run on a Linux box with qemu. +make.bash should be run on a Linux box with expect and qemu. +Debian packages: expect qemu-utils qemu-system-x86. After it completes, it creates a file openbsd-amd64-gce.tar.gz diff --git a/env/openbsd-amd64/make.bash b/env/openbsd-amd64/make.bash index b1457b80..95f1ea79 100755 --- a/env/openbsd-amd64/make.bash +++ b/env/openbsd-amd64/make.bash @@ -8,7 +8,7 @@ set -e set -u -readonly VERSION="6.2" +readonly VERSION="6.3" readonly RELNO="${VERSION/./}" readonly ARCH="${ARCH:-amd64}" @@ -23,7 +23,7 @@ readonly ISO="install${RELNO}-${ARCH}.iso" readonly ISO_PATCHED="install${RELNO}-${ARCH}-patched.iso" if [[ ! -f "${ISO}" ]]; then - curl -o "${ISO}" "http://${MIRROR}/pub/OpenBSD/${VERSION}/${ARCH}/install${RELNO}.iso" + curl -o "${ISO}" "https://${MIRROR}/pub/OpenBSD/${VERSION}/${ARCH}/install${RELNO}.iso" fi function cleanup() { @@ -32,7 +32,7 @@ function cleanup() { rm -f boot.conf rm -f disk.raw rm -f disklabel.template - rm -f etc/rc.local + rm -f etc/{installurl,rc.local} rm -f install.site rm -f random.seed rm -f site${RELNO}.tgz @@ -48,12 +48,15 @@ trap cleanup EXIT INT mkdir -p etc cat >install.site < boot.conf EOF +cat >etc/installurl <etc/rc.local <etc/rc.local <auto_install.conf <