svn commit: r355476 - head/libexec/rc

[Ed Maste]

Author: emaste
Date: Sat Dec  7 00:33:08 2019
New Revision: 355476
URL: https://svnweb.freebsd.org/changeset/base/355476

Log:
  rc.shutdown: kill shutdown process after logging message
  
  Move the kill -KILL $$ back to the pre-r354446 location at the end of
  the shutdown timeout handler.
  
  MFC with:	r354446

Modified:
  head/libexec/rc/rc.shutdown

Modified: head/libexec/rc/rc.shutdown
==============================================================================
--- head/libexec/rc/rc.shutdown	Sat Dec  7 00:28:08 2019	(r355475)
+++ head/libexec/rc/rc.shutdown	Sat Dec  7 00:33:08 2019	(r355476)
@@ -69,13 +69,13 @@ _rcshutdown_watchdog=
 if [ -n "$rcshutdown_timeout" ]; then
 	debug "Initiating watchdog timer."
 	sleep $rcshutdown_timeout && (
-		kill -KILL $$ >/dev/null 2>&1
 		_msg="$rcshutdown_timeout second watchdog"
 		_msg="$_msg timeout expired. Shutdown terminated."
 		logger -t rc.shutdown "$_msg"
 		echo
 		echo "$_msg"
 		date
+		kill -KILL $$ >/dev/null 2>&1
 	) &
 	_rcshutdown_watchdog=$!
 fi