From owner-svn-src-all@FreeBSD.ORG  Sun Jan 18 18:25:13 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6A433EA8;
 Sun, 18 Jan 2015 18:25:13 +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 56550CB3;
 Sun, 18 Jan 2015 18:25:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IIPDxY075820;
 Sun, 18 Jan 2015 18:25:13 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IIPDti075819;
 Sun, 18 Jan 2015 18:25:13 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201501181825.t0IIPDti075819@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland <smh@FreeBSD.org>
Date: Sun, 18 Jan 2015 18:25:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277333 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2015 18:25:13 -0000

Author: smh
Date: Sun Jan 18 18:25:12 2015
New Revision: 277333
URL: https://svnweb.freebsd.org/changeset/base/277333

Log:
  Fix bsdinstall when working with geli boot disks
  
  PR:		196790
  Differential Revision:	https://reviews.freebsd.org/D566
  Submitted by:	Michael Gmelin <grembo@FreeBSD.org>
  MFC after:	2 weeks
  Sponsored by:	Multiplay

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

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Sun Jan 18 18:11:54 2015	(r277332)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Sun Jan 18 18:25:12 2015	(r277333)
@@ -1077,6 +1077,9 @@ zfs_create_boot()
 			boot_vdevs="$boot_vdevs $disk$bootpart"
 		fi
 		zroot_vdevs="$zroot_vdevs $disk$targetpart"
+		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+			zroot_vdevs="$zroot_vdevs.eli"
+		fi
 
 		n=$(( $n + 1 ))
 	done # disks