From owner-svn-src-head@freebsd.org  Wed Oct 25 15:30:45 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFF41E4D7E8;
 Wed, 25 Oct 2017 15:30:45 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 AC431721F1;
 Wed, 25 Oct 2017 15:30:45 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9PFUiaX020637;
 Wed, 25 Oct 2017 15:30:44 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9PFUiBf020636;
 Wed, 25 Oct 2017 15:30:44 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201710251530.v9PFUiBf020636@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 25 Oct 2017 15:30:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324988 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 324988
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Oct 2017 15:30:46 -0000

Author: imp
Date: Wed Oct 25 15:30:44 2017
New Revision: 324988
URL: https://svnweb.freebsd.org/changeset/base/324988

Log:
  Handle RB_POWERCYCLE in the MI part of the kernel
  
  Signal init with SIGWINCH in shutdown_nice for RB_POWERCYCLE.
  
  Sponsored by: Netflix

Modified:
  head/sys/kern/kern_shutdown.c

Modified: head/sys/kern/kern_shutdown.c
==============================================================================
--- head/sys/kern/kern_shutdown.c	Wed Oct 25 15:30:40 2017	(r324987)
+++ head/sys/kern/kern_shutdown.c	Wed Oct 25 15:30:44 2017	(r324988)
@@ -283,6 +283,8 @@ shutdown_nice(int howto)
 		PROC_LOCK(initproc);
 		if (howto & RB_POWEROFF)
 			kern_psignal(initproc, SIGUSR2);
+		else if (howto & RB_POWERCYCLE)
+			kern_psignal(initproc, SIGWINCH);
 		else if (howto & RB_HALT)
 			kern_psignal(initproc, SIGUSR1);
 		else
@@ -817,7 +819,7 @@ static void
 poweroff_wait(void *junk, int howto)
 {
 
-	if (!(howto & RB_POWEROFF) || poweroff_delay <= 0)
+	if ((howto & (RB_POWEROFF | RB_POWERCYCLE)) == 0 || poweroff_delay <= 0)
 		return;
 	DELAY(poweroff_delay * 1000);
 }