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

1 files changed, 5 insertions, 3 deletions

diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index b52479e5093..644adf5a641 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.92 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.sgi,v 1.93 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -155,12 +155,14 @@ lcore_access.o lcore_ddb.o lcore_float.o locore.o: assym.h
 tlb_tfp.o tlbhandler.o: assym.h
 cache_tfp_subr.o ip30_nmi.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