From owner-svn-src-head@FreeBSD.ORG  Wed Apr 16 22:26:43 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2FB51643;
 Wed, 16 Apr 2014 22:26:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1CAB119EB;
 Wed, 16 Apr 2014 22:26:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GMQg7L071855;
 Wed, 16 Apr 2014 22:26:42 GMT (envelope-from emax@svn.freebsd.org)
Received: (from emax@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GMQgMo071854;
 Wed, 16 Apr 2014 22:26:42 GMT (envelope-from emax@svn.freebsd.org)
Message-Id: <201404162226.s3GMQgMo071854@svn.freebsd.org>
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Wed, 16 Apr 2014 22:26:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264571 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Wed, 16 Apr 2014 22:26:43 -0000

Author: emax
Date: Wed Apr 16 22:26:42 2014
New Revision: 264571
URL: http://svnweb.freebsd.org/changeset/base/264571

Log:
  when watchdogd is asked to exit nicely (via SIGTERM) it will
  stop timer. since watchdogd rc.d script is marked as 'shutdown'
  it will exit (on shutdown) and stop timer. if system happens to
  hung after watchdogd exited, manual reset is required. when one
  operates in "lights-out" type of environments and without
  readily available "remote hands" it could create a problem.
  
  this provides ability to override "stop signal" for watchdogd.
  default behavior is preserved, i.e. watchdogd will still be killed
  via SIGTERM and timer will be stopped. in order to activate new
  feature, one needs to put
  
  watchdogd_sig_stop="KILL"
  
  into /etc/rc.conf and also make sure watchdogd timeout is set
  to long enough value allowing system to come back online before
  timeout fires.
  
  Obtained from:	Netflix
  MFC after:	1 week

Modified:
  head/etc/rc.d/watchdogd

Modified: head/etc/rc.d/watchdogd
==============================================================================
--- head/etc/rc.d/watchdogd	Wed Apr 16 22:18:43 2014	(r264570)
+++ head/etc/rc.d/watchdogd	Wed Apr 16 22:26:42 2014	(r264571)
@@ -39,4 +39,7 @@ command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 
 load_rc_config $name
+
+sig_stop="${watchdogd_sig_stop:-TERM}"
+
 run_rc_command "$1"