From 7bc5585ecb1ee51361d72fbe34e16ec453c659cb Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Sun, 25 Jan 2009 10:31:45 +0000 Subject: [PATCH] Instead of killing the 'watchdog' subshell and leaving a sleep for rcshutdown_timeout (normally 30s) around re-parented to init, make sure both go away using pkill -P. While noone normally notices this for the system shutdown, it helps for cleanly shutting down trusted jails. Found without a killall in the base system, which in rc.d/jail normally ensures that all processes of a jail to be stopped will be killed. Reviewed by: silence on current@ MFC after: 4 weeks --- etc/rc.shutdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/rc.shutdown b/etc/rc.shutdown index ebe79d74132b..dc1ca1357df8 100644 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -98,7 +98,7 @@ done # Terminate the background watchdog timer (if it is running) # if [ -n "$_rcshutdown_watchdog" ]; then - kill -TERM $_rcshutdown_watchdog >/dev/null 2>&1 + pkill -TERM -P $_rcshutdown_watchdog >/dev/null 2>&1 fi # Insert other shutdown procedures here