fixup! Add support for OpenBSD 7.5

build.sh

@@ -5,18 +5,10 @@ set -euxo pipefail
 OS_VERSION="$1"; shift
 ARCHITECTURE="$1"; shift
 
-common_version_arg=""
-common_version_file="var_files/$OS_VERSION/common.pkrvars.hcl"
-
-if [ -f "$common_version_file" ]; then
-  common_version_arg="-var-file $common_version_file"
-fi
-
 packer build \
   -var os_version="$OS_VERSION" \
   -var-file "var_files/common.pkrvars.hcl" \
   -var-file "var_files/$ARCHITECTURE.pkrvars.hcl" \
   -var-file "var_files/$OS_VERSION/$ARCHITECTURE.pkrvars.hcl" \
-  $common_version_arg \
   "$@" \
   openbsd.pkr.hcl

openbsd.pkr.hcl

@@ -51,12 +51,6 @@ variable "network_interface" {
   description = "The network interface as it's named in OpenBSD"
 }
 
-variable "sets_http_server" {
-  default = "mirror.fra10.de.leaseweb.net"
-  type = string
-  description = "The HTTP server used to download the sets"
-}
-
 variable "checksum" {
   type = string
   description = "The checksum for the virtual hard drive file"
@@ -158,7 +152,6 @@ source "qemu" "qemu" {
     "SECONDARY_USER_PASSWORD=${var.secondary_user_password} ",
     "ROOT_PASSWORD=${var.root_password} ",
     "DISKLABEL_TEMPLATE='http://{{ .HTTPIP }}:{{ .HTTPPort }}/resources/template.disklabel' ",
-    "SETS_HTTP_SERVER=${var.sets_http_server} ",
     "sh install.sh && reboot<enter>"
   ]
 

resources/install.conf

@@ -10,7 +10,7 @@ Which disk is the root disk = sd0
 Use (W)hole disk MBR, whole disk (G)PT or (E)dit = g
 Location of sets = http
 URL to autopartitioning template for disklabel = {{ DISKLABEL_TEMPLATE }}
-Http Server = {{ SETS_HTTP_SERVER }}
+Http Server = mirror.fra10.de.leaseweb.net
 Unable to connect using https. Use http instead? = yes
 Set name(s) = -game* -man*
 Directory does not contain SHA256.sig. Continue without verification = yes