Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Sep 2020 17:04:27 +0000 (UTC)
From:      Conrad Meyer <cem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r366078 - head/sbin/reboot
Message-ID:  <202009231704.08NH4R5E054147@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009231704.08NH4R5E054147>