From 36cf69b33bdf594bfbeeaf101a0c2e8868eefdc0 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 30 Mar 2024 07:35:01 +0000 Subject: [PATCH] program relinking currently uses a Makefile.relink inside the re-link kit. For sshd (the only relinked program at the moment), this file is created in an extremely nasty way. It'll be better if we have a proper clean install.sh script, which I've built for sshd. But let's first commit the change to /etc/rc which will handle that in the near future. ok djm --- etc/rc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etc/rc b/etc/rc index 9d87fac8caf..0ea912fa78f 100644 --- a/etc/rc +++ b/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.572 2023/10/01 20:15:23 naddy Exp $ +# $OpenBSD: rc,v 1.573 2024/03/30 07:35:01 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 @@ -251,7 +251,11 @@ reorder_libs() { if [[ -f $_bint ]]; then echo " $_binn" tar xf $_bint - make -f Makefile.relink relink >/dev/null 2>&1 + if [[ -f install.sh ]]; then + sh install.sh >/dev/null 2>&1 + else + make -f Makefile.relink relink >/dev/null 2>&1 + fi fi ) || { _error=true; break; } done -- 2.20.1