From owner-svn-src-head@FreeBSD.ORG  Sun Jan 25 10:31:46 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 373A81065686;
	Sun, 25 Jan 2009 10:31:46 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25D3F8FC08;
	Sun, 25 Jan 2009 10:31:46 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PAVkvd013312;
	Sun, 25 Jan 2009 10:31:46 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0PAVk9I013311;
	Sun, 25 Jan 2009 10:31:46 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200901251031.n0PAVk9I013311@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 25 Jan 2009 10:31:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187685 - head/etc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2009 10:31:46 -0000

Author: bz
Date: Sun Jan 25 10:31:45 2009
New Revision: 187685
URL: http://svn.freebsd.org/changeset/base/187685

Log:
  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

Modified:
  head/etc/rc.shutdown

Modified: head/etc/rc.shutdown
==============================================================================
--- head/etc/rc.shutdown	Sun Jan 25 10:11:58 2009	(r187684)
+++ head/etc/rc.shutdown	Sun Jan 25 10:31:45 2009	(r187685)
@@ -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