Skip to content

Commit

Permalink
s
Browse files Browse the repository at this point in the history
  • Loading branch information
neil committed Jan 7, 2025
1 parent 7442133 commit 91f5346
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 2 deletions.
7 changes: 7 additions & 0 deletions conf/openbsd-7.3-aarch64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ VM_LOGIN_TAG="penBSD/arm64"
VM_ARCH=aarch64
VM_USE_CONSOLE_BUILD=1

VM_USE_SSHROOT_BUILD_SSH=1
#After install from the img file file, and reboot the new vm, the vm doesn't output to the vnc conosole, it only outputs to serial port
#so, we can not use vnc console to initialize sshd settings(vncdotool to login and input).
#we use sshpass to login to the server to initialize sshd settings, with "VM_USE_SSHROOT_BUILD_SSH=1"
VM_NO_VNC_BUILD=1



VM_OPTS="conf/openbsd-7.3-aarch64.resp"

Expand Down
2 changes: 1 addition & 1 deletion conf/openbsd-7.4-aarch64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ VM_LOGIN_TAG="penBSD/arm64"

VM_ARCH=aarch64
VM_USE_CONSOLE_BUILD=1

VM_USE_SSHROOT_BUILD_SSH=1

VM_OPTS="conf/openbsd-7.4-aarch64.resp"

Expand Down
1 change: 1 addition & 0 deletions conf/openbsd-7.5-aarch64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ VM_LOGIN_TAG="penBSD/arm64"

VM_ARCH=aarch64
VM_USE_CONSOLE_BUILD=1
VM_USE_SSHROOT_BUILD_SSH=1


VM_OPTS="conf/openbsd-7.5-aarch64.resp"
Expand Down
2 changes: 1 addition & 1 deletion conf/openbsd-7.6-aarch64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ VM_LOGIN_TAG="penBSD/arm64"

VM_ARCH=aarch64
VM_USE_CONSOLE_BUILD=1

VM_USE_SSHROOT_BUILD_SSH=1


VM_OPTS="conf/openbsd-7.6-aarch64.resp"
Expand Down
7 changes: 7 additions & 0 deletions enablessh.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@ mkdir -p ~/.ssh

chmod -R 600 ~/.ssh

rm -f ~/.ssh/id_rsa

ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -N ""

echo "StrictHostKeyChecking=accept-new" >>~/.ssh/config







8 changes: 8 additions & 0 deletions hooks/postBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
echo 'pkg_scripts=""' >>/etc/rc.conf.local


while ps aux | grep "[m]ake newbsd"; do
echo "reorder_kernel is running, just wait"
sleep 5
done

echo "OK, start syspatch"
sleep 10

syspatch

Expand All @@ -12,6 +19,7 @@ ret="$?"
#2 means no update
if [ "$ret" != "2" ] && [ "$ret" != "0" ]; then
echo "update error"
ps aux
exit $ret
fi

Expand Down

0 comments on commit 91f5346

Please sign in to comment.