From owner-svn-src-head@FreeBSD.ORG  Mon Apr  6 19:26:46 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3677CE54;
 Mon,  6 Apr 2015 19:26:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21D1C8CD;
 Mon,  6 Apr 2015 19:26:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36JQjY2015243;
 Mon, 6 Apr 2015 19:26:45 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36JQjuk015241;
 Mon, 6 Apr 2015 19:26:45 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201504061926.t36JQjuk015241@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 6 Apr 2015 19:26:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281167 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Apr 2015 19:26:46 -0000

Author: dteske
Date: Mon Apr  6 19:26:45 2015
New Revision: 281167
URL: https://svnweb.freebsd.org/changeset/base/281167

Log:
  Unbreak ZFS+GELI install option.
  
  Reported by:	delphij
  Submitted by:	delphij
  Pointy hat to:	dteske (me)
  MFC after:	3 days
  X-MFC-to:	stable/10 stable/9
  X-MFC-with:	r281160

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Apr  6 19:23:45 2015	(r281166)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Apr  6 19:26:45 2015	(r281167)
@@ -1128,7 +1128,7 @@ zfs_create_boot()
 			f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
 			             /dev/random "$bootpool/$zroot_key" \
 			             "bs=4096 count=1" || return $FAILURE
-			f_eval_catch $funcname "$CHMOD_MODE" \
+			f_eval_catch $funcname chmod "$CHMOD_MODE" \
 			             go-wrx "$bootpool/$zroot_key" ||
 			             return $FAILURE
 		else