From 0666b74cc8ea74ce8c440c3cde5598774fcc3bc4 Mon Sep 17 00:00:00 2001
From: Stefan Kreutz <mail@skreutz.com>
Date: Sat, 4 Apr 2020 11:55:25 +0200
Subject: Revise

---
 .gitignore |  2 +-
 disklabel  |  6 +++---
 run        | 12 +++++-------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 034d478..c5110f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 .openbsd-vm
-openbsd-66-vm.qcow2
+openbsd-vm.qcow2
diff --git a/disklabel b/disklabel
index eb18b12..d3b88fd 100644
--- a/disklabel
+++ b/disklabel
@@ -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
diff --git a/run b/run
index 4afbfef..7e1d8c0 100755
--- a/run
+++ b/run
@@ -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" )
-- 
cgit v1.2.3