=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.118 retrieving revision 1.120 diff -u -r1.118 -r1.120 --- openbsd/update_openbsd/update_openbsd 2018/12/16 21:10:00 1.118 +++ openbsd/update_openbsd/update_openbsd 2019/03/02 00:34:34 1.120 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.117 2018/12/16 20:57:49 andrew Exp $ +# $AFresh1: update_openbsd,v 1.119 2018/12/16 23:42:07 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -172,7 +172,7 @@ if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then if [ X"No" != X"${FORCE_DIR}" ]; then _dir=${FORCE_DIR} - elif sysctl kern.version | grep -q -- '-current '; then + elif sysctl kern.version | grep -q -e '-current ' -e '-beta '; then _dir=snapshots FORCE_DIR=snapshots else @@ -546,6 +546,9 @@ done cd $OLDPWD fi + + echo "===> Updating /var/db/kernel.SHA256" + sha256 -h /var/db/kernel.SHA256 ${_d}/bsd } install_sets() { @@ -751,6 +754,11 @@ fi echo "/sbin/reboot copied to /sbin/oreboot" fi +fi + +if [ $( ls -1 /usr/share/relink/ 2>/dev/null | wc -l ) -gt 0 ]; then + echo "==> REMOVING /usr/share/relink/*" + rm -rf /usr/share/relink/* fi install_kernels