From owner-svn-src-head@freebsd.org  Wed Sep 23 17:04:28 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F47E3FF60B;
 Wed, 23 Sep 2020 17:04:28 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BxPfh1sTdz3cdp;
 Wed, 23 Sep 2020 17:04:28 +0000 (UTC) (envelope-from cem@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 23F4A13F16;
 Wed, 23 Sep 2020 17:04:28 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08NH4RaR054148;
 Wed, 23 Sep 2020 17:04:27 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08NH4R5E054147;
 Wed, 23 Sep 2020 17:04:27 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <202009231704.08NH4R5E054147@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Wed, 23 Sep 2020 17:04:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r366078 - head/sbin/reboot
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/sbin/reboot
X-SVN-Commit-Revision: 366078
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.33
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, 23 Sep 2020 17:04:28 -0000

Author: cem
Date: Wed Sep 23 17:04:27 2020
New Revision: 366078
URL: https://svnweb.freebsd.org/changeset/base/366078

Log:
  nextboot(8): Fix behavior on non-ZFS /boot systems
  
  Fix unquoted test for an empty value, which broke nextboot(8) on non-ZFS /boot
  systems after r365938.
  
  Discussed with:	allanjude, tsoome
  X-MFC-With:	r365938

Modified:
  head/sbin/reboot/nextboot.sh

Modified: head/sbin/reboot/nextboot.sh
==============================================================================
--- head/sbin/reboot/nextboot.sh	Wed Sep 23 14:52:43 2020	(r366077)
+++ head/sbin/reboot/nextboot.sh	Wed Sep 23 17:04:27 2020	(r366078)
@@ -116,7 +116,7 @@ set -e
 
 nextboot_tmp=$(mktemp $(dirname ${nextboot_file})/nextboot.XXXXXX)
 
-if [ -n ${zfs} ]; then
+if [ -n "${zfs}" ]; then
 	zfsbootcfg -z ${zfs} -n freebsd:nvstore -k nextboot_enable -v YES
 	cat >> ${nextboot_tmp} << EOF
 $kenv