Only overwrite ${DESTDIR}${KODIR}.old/${KERNEL_KO} if we haven't

booted from it when doing an installkernel.

Only change kern.bootfile from ${DESTDIR}${KODIR}/${KERNEL_KO}
to ${DESTDIR}${KODIR}.old/${KERNEL_KO}, and only when we're renaming
a booted ${DESTDIR}${KODIR}/${KERNEL_KO} kernel.

1 files changed, 14 insertions, 7 deletions

diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index a1447b8..3c9a1e6 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -251,13 +251,20 @@ kernel-install kernel-install.debug:
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}${KODIR})
-.if exists(${DESTDIR}${KODIR}.old)
-	@-chflags -R noschg ${DESTDIR}${KODIR}.old
-	-rm -rf ${DESTDIR}${KODIR}.old
-.endif
-	mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
-	[ "`sysctl -n kern.bootfile`" != "${DESTDIR}${KODIR}/kernel" ] || \
-		sysctl kern.bootfile=${DESTDIR}${KODIR}.old/kernel
+	-thiskernel=`sysctl -n kern.bootfile` ; \
+	if [ "$$thiskernel" = ${DESTDIR}${KODIR}.old/${KERNEL_KO} ] ; then \
+		chflags -R noschg ${DESTDIR}${KODIR} ; \
+		rm -rf ${DESTDIR}${KODIR} ; \
+	else \
+		if [ -d ${DESTDIR}${KODIR}.old ] ; then \
+			chflags -R noschg ${DESTDIR}${KODIR}.old ; \
+			rm -rf ${DESTDIR}${KODIR}.old ; \
+		fi ; \
+		mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
+		if [ "$$thiskernel" = ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
+			sysctl -w kern.bootfile=${DESTDIR}${KODIR}.old/${KERNEL_KO} ; \
+		fi; \
+	fi
 .endif
 	mkdir -p ${DESTDIR}${KODIR}
 	install -c -m 555 -o root -g wheel \