summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kreutz <mail@skreutz.com>2020-04-01 02:16:34 +0200
committerStefan Kreutz <mail@skreutz.com>2020-04-01 02:16:34 +0200
commitfc4484b7048c7c6998b5c2bdf38ebc6e9c6588af (patch)
tree05f43d225defeda59119aa4c6dec0c5a384fd955
parent07b231f21841c951a2db60475c17730b647f7542 (diff)
downloadautoinstall-openbsd-on-qemu-fc4484b7048c7c6998b5c2bdf38ebc6e9c6588af.tar
Revise
-rw-r--r--.gitignore1
-rw-r--r--disklabel.conf2
l---------[-rw-r--r--]http/disklabel.conf3
-rw-r--r--install.conf (renamed from http/install.conf)0
-rwxr-xr-xrun3
5 files changed, 6 insertions, 3 deletions
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
index 74c93f7..1ced26d 100644..120000
--- a/http/disklabel.conf
+++ b/http/disklabel.conf
@@ -1,2 +1 @@
-/ 12G
-swap 1G
+../disklabel.conf \ No newline at end of file
diff --git a/http/install.conf b/install.conf
index 01c0d93..01c0d93 100644
--- a/http/install.conf
+++ b/install.conf
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
}
Generated by cgit. See skreutz.com for my tech blog and contact information.