Skip to content

Commit 99fd276

Browse files
author
Greg Steuck
committed
Apply the published patches.
1 parent 3e19370 commit 99fd276

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

env/openbsd-amd64/make.bash

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function cleanup() {
3232
rm -f boot.conf
3333
rm -f disk.raw
3434
rm -f disklabel.template
35-
rm -f etc/rc.local
35+
rm -f etc/{installurl,rc.local}
3636
rm -f install.site
3737
rm -f random.seed
3838
rm -f site${RELNO}.tgz
@@ -48,12 +48,15 @@ trap cleanup EXIT INT
4848
mkdir -p etc
4949
cat >install.site <<EOF
5050
#!/bin/sh
51-
env PKG_PATH=http://${MIRROR}/pub/OpenBSD/${VERSION}/packages/${ARCH} \
52-
pkg_add -iv bash curl git
51+
syspatch
52+
pkg_add -iv bash curl git
5353
5454
echo 'set tty com0' > boot.conf
5555
EOF
5656

57+
cat >etc/installurl <<EOF
58+
https://${MIRROR}/pub/OpenBSD
59+
EOF
5760
cat >etc/rc.local <<EOF
5861
(
5962
set -x
@@ -80,7 +83,7 @@ cat >etc/rc.local <<EOF
8083
)
8184
EOF
8285
chmod +x install.site
83-
tar -zcvf site${RELNO}.tgz install.site etc/rc.local
86+
tar -zcvf site${RELNO}.tgz install.site etc/{installurl,rc.local}
8487

8588
# Autoinstall script.
8689
cat >auto_install.conf <<EOF

0 commit comments

Comments
 (0)