From owner-svn-src-head@freebsd.org  Fri Sep 14 18:12:31 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F840108FCFF;
 Fri, 14 Sep 2018 18:12:31 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 52E188C443;
 Fri, 14 Sep 2018 18:12:31 +0000 (UTC)
 (envelope-from vangyzen@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4DB4F27F4E;
 Fri, 14 Sep 2018 18:12:31 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8EICVAH010388;
 Fri, 14 Sep 2018 18:12:31 GMT (envelope-from vangyzen@FreeBSD.org)
Received: (from vangyzen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8EICVnq010387;
 Fri, 14 Sep 2018 18:12:31 GMT (envelope-from vangyzen@FreeBSD.org)
Message-Id: <201809141812.w8EICVnq010387@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to
 vangyzen@FreeBSD.org using -f
From: Eric van Gyzen <vangyzen@FreeBSD.org>
Date: Fri, 14 Sep 2018 18:12:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338688 - head/sbin/reboot
X-SVN-Group: head
X-SVN-Commit-Author: vangyzen
X-SVN-Commit-Paths: head/sbin/reboot
X-SVN-Commit-Revision: 338688
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.27
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: Fri, 14 Sep 2018 18:12:31 -0000

Author: vangyzen
Date: Fri Sep 14 18:12:30 2018
New Revision: 338688
URL: https://svnweb.freebsd.org/changeset/base/338688

Log:
  Fix "fasthalt" to halt instead of reboot
  
  fasthalt has behaved like reboot, instead of like halt, since r228408
  (2011, 10.0-RELEASE).  Fix it.  One wonders if anyone will notice.
  
  Approved by:	re (kib)
  MFC after:	3 days
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sbin/reboot/reboot.c

Modified: head/sbin/reboot/reboot.c
==============================================================================
--- head/sbin/reboot/reboot.c	Fri Sep 14 17:04:36 2018	(r338687)
+++ head/sbin/reboot/reboot.c	Fri Sep 14 18:12:30 2018	(r338688)
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
 	u_int pageins;
 	const char *user, *kernel = NULL;
 
-	if (strcmp(getprogname(), "halt") == 0) {
+	if (strstr(getprogname(), "halt") != NULL) {
 		dohalt = 1;
 		howto = RB_HALT;
 	} else