svn commit: r321053 - stable/11

[Ed Maste]

Author: emaste
Date: Sun Jul 16 19:20:15 2017
New Revision: 321053
URL: https://svnweb.freebsd.org/changeset/base/321053

Log:
  MFC r319219: add a sanity check before installworld on the running system
  
  FreeBSD does not guarantee kernel forward compatibility (that is,
  running a newer userland on an older kernel).  The documented upgrade
  procedure specifies that installkernel should be performed, followed by
  a reboot and then installworld.  As a sanity check when installing onto
  the running system (DESTDIR is / or unset), attempt to run "sh echo OK"
  using rescue from the objdir.  If rescue fails (e.g., because the system
  has not been rebooted and the "old" kernel lacks a system call required
  by the to-be-installed world), abort the installation.
  
  This was added to avoid ino64 foot-shooting in HEAD, but is generally
  useful for any upgrade case adding new syscalls.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Sun Jul 16 19:16:02 2017	(r321052)
+++ stable/11/Makefile.inc1	Sun Jul 16 19:20:15 2017	(r321053)
@@ -915,6 +915,22 @@ __installcheck_UGID: .PHONY
 	fi
 .endfor
 .endif
+#
+# If installing over the running system (DESTDIR is / or unset) and the install
+# includes rescue, try running rescue from the objdir as a sanity check.  If
+# rescue is not functional (e.g., because it depends on a system call not
+# supported by the currently running kernel), abort the installation.
+#
+.if !make(distributeworld) && ${MK_RESCUE} != "no" && \
+    (empty(DESTDIR) || ${DESTDIR} == "/") && empty(BYPASS_INSTALLCHECK_SH)
+_installcheck_world: __installcheck_sh_check
+__installcheck_sh_check: .PHONY
+	@if [ "`${OBJTREE}${.CURDIR}/rescue/rescue/rescue sh -c 'echo OK'`" != \
+	    OK ]; then \
+		echo "rescue/sh check failed, installation aborted" >&2; \
+		false; \
+	fi
+.endif
 
 #
 # Required install tools to be saved in a scratch dir for safety.