From owner-svn-src-all@FreeBSD.ORG  Mon Apr  7 21:18:12 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 9443188A;
 Mon,  7 Apr 2014 21:18:12 +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 81225398;
 Mon,  7 Apr 2014 21:18:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37LICZ5051795;
 Mon, 7 Apr 2014 21:18:12 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37LICaj051794;
 Mon, 7 Apr 2014 21:18:12 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201404072118.s37LICaj051794@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 7 Apr 2014 21:18:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264240 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Mon, 07 Apr 2014 21:18:12 -0000

Author: ed
Date: Mon Apr  7 21:18:12 2014
New Revision: 264240
URL: http://svnweb.freebsd.org/changeset/base/264240

Log:
  Thinko: don't forget to apply 'howto' in case init(8) isn't running.

Modified:
  head/sys/kern/kern_shutdown.c

Modified: head/sys/kern/kern_shutdown.c
==============================================================================
--- head/sys/kern/kern_shutdown.c	Mon Apr  7 21:16:51 2014	(r264239)
+++ head/sys/kern/kern_shutdown.c	Mon Apr  7 21:18:12 2014	(r264240)
@@ -218,9 +218,8 @@ shutdown_nice(int howto)
 		PROC_UNLOCK(initproc);
 	} else {
 		/* No init(8) running, so simply reboot. */
-		kern_reboot(RB_NOSYNC);
+		kern_reboot(howto | RB_NOSYNC);
 	}
-	return;
 }
 
 static void