From e751d176f3bdce759a3b092b414c0279c0f3abf5 Mon Sep 17 00:00:00 2001
From: Steven Hartland <smh@FreeBSD.org>
Date: Sun, 18 Jan 2015 18:25:12 +0000
Subject: [PATCH] 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
---
 usr.sbin/bsdinstall/scripts/zfsboot | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 673961aef980..5bdf94fa0a98 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -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