From owner-svn-src-stable-7@FreeBSD.ORG  Fri Sep 24 07:29:29 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CEECA1065670;
	Fri, 24 Sep 2010 07:29:29 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BECF48FC0A;
	Fri, 24 Sep 2010 07:29:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8O7TTOM093608;
	Fri, 24 Sep 2010 07:29:29 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8O7TT9E093606;
	Fri, 24 Sep 2010 07:29:29 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201009240729.o8O7TT9E093606@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 24 Sep 2010 07:29:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213095 - stable/7/sbin/reboot
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Sep 2010 07:29:29 -0000

Author: avg
Date: Fri Sep 24 07:29:29 2010
New Revision: 213095
URL: http://svn.freebsd.org/changeset/base/213095

Log:
  MFC r212789: nextboot: warn about limitations of /boot/nextboot.conf on ZFS

Modified:
  stable/7/sbin/reboot/nextboot.sh
Directory Properties:
  stable/7/sbin/reboot/   (props changed)

Modified: stable/7/sbin/reboot/nextboot.sh
==============================================================================
--- stable/7/sbin/reboot/nextboot.sh	Fri Sep 24 07:27:53 2010	(r213094)
+++ stable/7/sbin/reboot/nextboot.sh	Fri Sep 24 07:29:29 2010	(r213095)
@@ -50,6 +50,14 @@ if [ ${force} = "NO" -a ! -d /boot/${ker
 	exit 1
 fi
 
+df -Tn "/boot/" 2>/dev/null | while read _fs _type _other ; do
+	[ "zfs" = "${_type}" ] || continue
+	cat 1>&2 <<-EOF
+		WARNING: loader(8) has only R/O support for ZFS
+		nextboot.conf will NOT be reset in case of kernel boot failure
+	EOF
+done
+
 cat > ${nextboot_file} << EOF
 nextboot_enable="YES"
 kernel="${kernel}"