Skip to content

Commit 1355586

Browse files
4a6f656cdmitshur
authored andcommitted
env/openbsd-amd64: syspatch on first boot
syspatch is currently being invoked at the end of the installation, which means we're trying to patch the installation ramdisk kernel, rather than the generic kernel. Instead, invoke syspatch during the first boot of the generic kernel. Move pkg_add as well, since that is also generally safer to run outside of the installation. Update golang/go#35712 Update golang/go#42542 Change-Id: Icbb384816de5859078a0183919626d223fb0060f Reviewed-on: https://go-review.googlesource.com/c/build/+/278732 Trust: Joel Sing <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 911ac7d commit 1355586

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

env/openbsd-amd64/make.bash

+7-3
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,20 @@ fi
5454
mkdir -p etc
5555
cat >install.site <<EOF
5656
#!/bin/sh
57-
syspatch
58-
pkg_add -iv ${PKG_ADD_OPTIONS} bash curl git
59-
57+
touch /firstboot
6058
echo 'set tty com0' > boot.conf
6159
EOF
6260

6361
cat >etc/installurl <<EOF
6462
https://${MIRROR}/pub/OpenBSD
6563
EOF
6664
cat >etc/rc.local <<EOF
65+
if [[ -f /firstboot ]]; then
66+
syspatch
67+
pkg_add -iv ${PKG_ADD_OPTIONS} bash curl git
68+
rm -f /firstboot
69+
fi
70+
6771
(
6872
set -x
6973

0 commit comments

Comments
 (0)