From fc4484b7048c7c6998b5c2bdf38ebc6e9c6588af Mon Sep 17 00:00:00 2001
From: Stefan Kreutz <mail@skreutz.com>
Date: Wed, 1 Apr 2020 02:16:34 +0200
Subject: Revise

---
 .gitignore          |  1 +
 disklabel.conf      |  2 ++
 http/disklabel.conf |  3 +--
 http/install.conf   | 15 ---------------
 install.conf        | 15 +++++++++++++++
 run                 |  3 ++-
 6 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 disklabel.conf
 mode change 100644 => 120000 http/disklabel.conf
 delete mode 100644 http/install.conf
 create mode 100644 install.conf

diff --git a/.gitignore b/.gitignore
index 7fe9404..40ffe06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 http/pub/
+http/install.conf
 openbsd-66-base.pub
 openbsd-66-vm.qcow2
diff --git a/disklabel.conf b/disklabel.conf
new file mode 100644
index 0000000..74c93f7
--- /dev/null
+++ b/disklabel.conf
@@ -0,0 +1,2 @@
+/ 12G
+swap 1G
diff --git a/http/disklabel.conf b/http/disklabel.conf
deleted file mode 100644
index 74c93f7..0000000
--- a/http/disklabel.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/ 12G
-swap 1G
diff --git a/http/disklabel.conf b/http/disklabel.conf
new file mode 120000
index 0000000..1ced26d
--- /dev/null
+++ b/http/disklabel.conf
@@ -0,0 +1 @@
+../disklabel.conf
\ No newline at end of file
diff --git a/http/install.conf b/http/install.conf
deleted file mode 100644
index 01c0d93..0000000
--- a/http/install.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-Change the default console to com0 = yes
-Which speed should com0 use = 115200
-System hostname = openbsd-vm
-Password for root = *************
-Allow root ssh login = no
-Setup a user = puffy
-Password for user = *************
-What timezone are you in = UTC
-Location of sets = http
-HTTP Server = 10.0.2.2
-Unable to connect using https. Use http instead = yes
-URL to autopartitioning template for disklabel = http://10.0.2.2/disklabel.conf
-Set name(s) = site66.tgz
-Checksum test for site66.tgz failed. Continue anyway = yes
-Unverified sets: site66.tgz. Continue without verification = yes
diff --git a/install.conf b/install.conf
new file mode 100644
index 0000000..01c0d93
--- /dev/null
+++ b/install.conf
@@ -0,0 +1,15 @@
+Change the default console to com0 = yes
+Which speed should com0 use = 115200
+System hostname = openbsd-vm
+Password for root = *************
+Allow root ssh login = no
+Setup a user = puffy
+Password for user = *************
+What timezone are you in = UTC
+Location of sets = http
+HTTP Server = 10.0.2.2
+Unable to connect using https. Use http instead = yes
+URL to autopartitioning template for disklabel = http://10.0.2.2/disklabel.conf
+Set name(s) = site66.tgz
+Checksum test for site66.tgz failed. Continue anyway = yes
+Unverified sets: site66.tgz. Continue without verification = yes
diff --git a/run b/run
index 7bc0664..8fe53a4 100755
--- a/run
+++ b/run
@@ -41,7 +41,8 @@ tar -czf http/pub/OpenBSD/6.6/amd64/site66.tgz install.site
 ( cd http/pub/OpenBSD/6.6/amd64 && ls -l > index.txt )
 
 # Add public ssh key to install.conf.
-grep -q -e "^Public ssh key for user =" http/install.conf || {
+cp install.conf http/install.conf
+grep -q -e "^Public ssh key for user =" install.conf || {
   ssh_pub_key="$( cat ~/.ssh/id_rsa.pub )"
   echo "Public ssh key for user = ${ssh_pub_key}" >> http/install.conf
 }
-- 
cgit v1.2.3