=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v retrieving revision 1.568 retrieving revision 1.569 diff -c -r1.568 -r1.569 *** src/etc/rc 2022/12/28 09:53:33 1.568 --- src/etc/rc 2023/01/18 20:44:40 1.569 *************** *** 1,4 **** ! # $OpenBSD: rc,v 1.568 2022/12/28 09:53:33 kn Exp $ # System startup script run by init on autoboot or after single-user. # Output and error are redirected to console by init, and the console is the --- 1,4 ---- ! # $OpenBSD: rc,v 1.569 2023/01/18 20:44:40 deraadt Exp $ # System startup script run by init on autoboot or after single-user. # Output and error are redirected to console by init, and the console is the *************** *** 188,194 **** fi done ! echo 'reordering libraries:' # Remount the (read-only) filesystems in _ro_list as read-write. for _mp in $_ro_list; do --- 188,194 ---- fi done ! echo 'reordering:' # Remount the (read-only) filesystems in _ro_list as read-write. for _mp in $_ro_list; do *************** *** 237,242 **** --- 237,257 ---- ) || { _error=true; break; } done + for _bin in $_relink/usr/sbin/sshd; do + _tmpdir=$(mktemp -dq $_relink/_rebuild.XXXXXXXXXXXX) && + ( + set -o errexit + cd $_tmpdir + _binn=${_bin##*/} + _bint=${_bin}/${_binn}.tar + if [[ -f $_bint ]]; then + echo " $_binn" + tar xf $_bint + make -f Makefile.relink relink >/dev/null 2>&1 + fi + ) || { _error=true; break; } + done + rm -rf $_relink/_rebuild.* # Restore previous mount state if it was changed.