svn commit: r355480 - stable/12/libexec/rc

[Ed Maste]

Author: emaste
Date: Sat Dec  7 03:29:58 2019
New Revision: 355480
URL: https://svnweb.freebsd.org/changeset/base/355480

Log:
  MFC r354446: rc.shutdown: print a newline before watchdog timeout message
  
  Previously the watchdog timeout message was appended to the last entry
  in the "Waiting for PIDS" list, resulting in a message like
  
      Waiting for PIDS: 31299 31296 90201 9020090 second watchdog timeout
      expired. Shutdown terminated.
  
  Print a newline to separate the watchdog timeout message.
  
  Also MFC 355476: 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.
  
  PR:		241072
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/libexec/rc/rc.shutdown
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rc/rc.shutdown
==============================================================================
--- stable/12/libexec/rc/rc.shutdown	Sat Dec  7 01:10:38 2019	(r355479)
+++ stable/12/libexec/rc/rc.shutdown	Sat Dec  7 03:29:58 2019	(r355480)
@@ -72,6 +72,7 @@ if [ -n "$rcshutdown_timeout" ]; then
 		_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