From 886be5725f1222599910e1c34f7b6fb54b0b753a Mon Sep 17 00:00:00 2001
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 9 Dec 2013 22:58:26 +0000
Subject: [PATCH] Fix a regression introduced by SVN r257842. Result was that
 after successfully installing to encrypted ZFS root, the passphrase is not
 accepted and a message about "incorrect key" is displayed.

MFC after:	3 days
---
 usr.sbin/bsdinstall/scripts/zfsboot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 90d6240dad20..a2b9f0af67d1 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -1203,7 +1203,7 @@ zfs_create_boot()
 			return $FAILURE
 		f_eval_catch $funcname printf "$PRINTF_CONF" \
 			geli_%s_keyfile0_type \
-			'"$disk$targetpart" "$disk$targetpart"' \
+			'"$disk$targetpart" "$disk$targetpart:geli_keyfile0"' \
 			\$BSDINSTALL_TMPBOOT/loader.conf.\$disk\$targetpart ||
 			return $FAILURE
 		f_eval_catch $funcname printf "$PRINTF_CONF" \