From owner-svn-src-head@FreeBSD.ORG Fri Sep 17 09:50:36 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EFC8106564A; Fri, 17 Sep 2010 09:50:36 +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 8D8E68FC08; Fri, 17 Sep 2010 09:50:36 +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 o8H9oa6h025412; Fri, 17 Sep 2010 09:50:36 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8H9oaoB025410; Fri, 17 Sep 2010 09:50:36 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201009170950.o8H9oaoB025410@svn.freebsd.org> From: Andriy Gapon Date: Fri, 17 Sep 2010 09:50:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212789 - head/sbin/reboot X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2010 09:50:36 -0000 Author: avg Date: Fri Sep 17 09:50:36 2010 New Revision: 212789 URL: http://svn.freebsd.org/changeset/base/212789 Log: nextboot: warn about limitations of /boot/nextboot.conf on ZFS MFC after: 1 week Modified: head/sbin/reboot/nextboot.sh Modified: head/sbin/reboot/nextboot.sh ============================================================================== --- head/sbin/reboot/nextboot.sh Fri Sep 17 09:14:40 2010 (r212788) +++ head/sbin/reboot/nextboot.sh Fri Sep 17 09:50:36 2010 (r212789) @@ -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}"