From 8ebf8976837b4d18f6e5d78d0f1825f7e9317cd5 Mon Sep 17 00:00:00 2001 From: Florian Obser Date: Sat, 4 Nov 2017 16:04:17 +0000 Subject: Since rev 1.502 of rc(8) it creates a /bsd.booted hard link. At the end of rc we call reorder_kernel which creates a /obsd hard link to the same kernel. In the past obsd was only created when doing a manual make install in the kernel sources. There is no need for two backup hard links during boot, rearange the kernel Makefiles to restore previous behaviour and thus stopping reorder_kernel from scribbling over /obsd. Makes muscle memory of some kernel developers work again: /obsd can serve as a known good kernel; and there was much rejoycing... Discussed at length with benno, rpe, phessler and tb at p2k17. Seems like a good idea to deraadt. OK benno, phessler, rpe, tb --- sys/arch/landisk/conf/Makefile.landisk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sys/arch/landisk/conf') diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index 54f49b1a5f9..a87efd66fb7 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.75 2017/09/28 16:16:34 patrick Exp $ +# $OpenBSD: Makefile.landisk,v 1.76 2017/11/04 16:04:16 florian Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -140,12 +140,14 @@ locore.o: ${_machdir}/${_mach}/locore.S assym.h locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore_subr.o vectors.o in_cksum.o: assym.h -newinstall: +hardlink-obsd: cmp -s bsd /bsd || ln -f /bsd /obsd + +newinstall: umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \ sha256 -h /var/db/kernel.SHA256 /bsd -install: update-link newinstall +install: update-link hardlink-obsd newinstall # pull in the dependency information .ifnmake clean -- cgit v1.2.3