From owner-svn-src-stable@FreeBSD.ORG  Mon Feb 20 10:15:21 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E19E106564A;
	Mon, 20 Feb 2012 10:15:21 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F0F678FC0C;
	Mon, 20 Feb 2012 10:15:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1KAFKJk046686;
	Mon, 20 Feb 2012 10:15:20 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1KAFKYT046684;
	Mon, 20 Feb 2012 10:15:20 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201202201015.q1KAFKYT046684@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 20 Feb 2012 10:15:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231935 - stable/7/etc/defaults
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Feb 2012 10:15:21 -0000

Author: dougb
Date: Mon Feb 20 10:15:20 2012
New Revision: 231935
URL: http://svn.freebsd.org/changeset/base/231935

Log:
  MFC r231862:
  Increase the default shutdown timer to 90 seconds. This will allow
  certain systems that take a long time to shut down, without adversely
  affecting things that shut down quickly. It's also 30 seconds less than
  the default hard limit of 120 seconds in kern.init_shutdown_timeout.
  
  PR:		conf/109272
  Submitted by:	Radim Kolar SF.NET <hsn@sendmail.cz>

Modified:
  stable/7/etc/defaults/rc.conf
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/defaults/rc.conf
==============================================================================
--- stable/7/etc/defaults/rc.conf	Mon Feb 20 10:14:22 2012	(r231934)
+++ stable/7/etc/defaults/rc.conf	Mon Feb 20 10:15:20 2012	(r231935)
@@ -23,7 +23,7 @@
 
 rc_debug="NO"		# Set to YES to enable debugging output from rc.d
 rc_info="NO"		# Enables display of informational messages at boot.
-rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown
+rcshutdown_timeout="90" # Seconds to wait before terminating rc.shutdown
 early_late_divider="FILESYSTEMS"	# Script that separates early/late
 			# stages of the boot process.  Make sure you know
 			# the ramifications if you change this.