From owner-svn-src-all@FreeBSD.ORG  Wed May 23 19:25:47 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7B32C106564A;
	Wed, 23 May 2012 19:25:47 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 665A98FC14;
	Wed, 23 May 2012 19:25:47 +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 q4NJPlkJ091180;
	Wed, 23 May 2012 19:25:47 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4NJPlWX091178;
	Wed, 23 May 2012 19:25:47 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201205231925.q4NJPlWX091178@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Wed, 23 May 2012 19:25:47 +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: r235855 - head/sbin/shutdown
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 May 2012 19:25:47 -0000

Author: jilles
Date: Wed May 23 19:25:46 2012
New Revision: 235855
URL: http://svn.freebsd.org/changeset/base/235855

Log:
  shutdown: Remove unnecessary 2-second delay.

Modified:
  head/sbin/shutdown/shutdown.c

Modified: head/sbin/shutdown/shutdown.c
==============================================================================
--- head/sbin/shutdown/shutdown.c	Wed May 23 18:56:29 2012	(r235854)
+++ head/sbin/shutdown/shutdown.c	Wed May 23 19:25:46 2012	(r235855)
@@ -356,7 +356,6 @@ perform_shutdown(void)
 	syslog(LOG_NOTICE, "%s by %s: %s",
 	    doreboot ? "reboot" : dohalt ? "halt" : dopower ? "power-down" : 
 	    "shutdown", whom, mbuf);
-	(void)sleep(2);
 
 	(void)printf("\r\nSystem shutdown time has arrived\007\007\r\n");
 	if (killflg) {