diff options
author | Stefan Kreutz <mail@skreutz.com> | 2020-04-04 11:55:25 +0200 |
---|---|---|
committer | Stefan Kreutz <mail@skreutz.com> | 2020-04-04 11:55:25 +0200 |
commit | 0666b74cc8ea74ce8c440c3cde5598774fcc3bc4 (patch) | |
tree | 8c8b393544d9b1c196dcb55097f7223e33ec850c | |
parent | 41ca49acbc082a31d2ca895563e16db145872bdc (diff) | |
download | autoinstall-openbsd-on-qemu-0666b74cc8ea74ce8c440c3cde5598774fcc3bc4.tar |
Revise
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | disklabel | 6 | ||||
-rwxr-xr-x | run | 12 |
3 files changed, 9 insertions, 11 deletions
@@ -1,2 +1,2 @@ .openbsd-vm -openbsd-66-vm.qcow2 +openbsd-vm.qcow2 @@ -1,8 +1,8 @@ -/ 2G -swap 1G +/ 1G +swap 8G /tmp 1G /var 1G -/var/www 1G +/var/www 100G /usr 2G /usr/X11R6 500M /usr/local 4G @@ -1,7 +1,6 @@ #! /bin/sh -# Auto-install OpenBSD/amd64 6.6 to a QEMU guest machine. A POSIX shell script -# intended to run headless, ssh-controlled integration tests. +# Auto-install OpenBSD/amd64 6.6 to a QEMU guest machine. # # Run the following command to serve the OpenBSD mirror at http://127.0.0.1 # (port 80): @@ -21,8 +20,6 @@ # For example, the following command forwards port 8080 on the host to port 80 # on the guest: # -# FIXME: Configure or disable pf -# # ssh \ # -o "StrictHostKeyChecking no" \ # -o "UserKnownHostsFile /dev/null" \ @@ -52,8 +49,8 @@ set -o xtrace # Set parameters. VM_FILE="${VM_FILE-openbsd-vm.qcow2}" -DISK_SIZE="${DISK_SIZE-20G}" -CPU_COUNT="${CPU_COUNT-1}" +DISK_SIZE="${DISK_SIZE-160G}" +CPU_COUNT="${CPU_COUNT-6}" MEMORY_SIZE="${MEMORY_SIZE-4G}" # Remove existing virtual machine if configuration changed. @@ -117,7 +114,8 @@ then # Wait until the HTTP server is online. # # TODO: Serve HTTP and TFTP from another virtual machine to remove the - # necissity to bind to a privileged port. + # necessity to bind to a privileged port. Maybe use Linux' tftpd from Arch + # Linux package tftp-hpa. Redirect ports using qemu. while [ ! "$( curl --silent --location --write-out '%{http_code}\n' --output /dev/null http://127.0.0.1/install.conf )" = 200 ] ; do ( >&2 printf "Please serve the directory ./openbsd-vm/mirror at http://127.0.0.1 (port 80).\n" ) |