From ba3bb622ece397871a5fc77ae3fba235561fa4e7 Mon Sep 17 00:00:00 2001
From: emaste <emaste@FreeBSD.org>
Date: Sat, 7 Dec 2019 00:33:08 +0000
Subject: [PATCH] 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
---
 libexec/rc/rc.shutdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/rc/rc.shutdown b/libexec/rc/rc.shutdown
index f8cdade4423a..704546b1fb2a 100644
--- a/libexec/rc/rc.shutdown
+++ b/libexec/rc/rc.shutdown
@@ -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