Author: dteske
Date: Mon Dec 9 22:58:26 2013
New Revision: 259144
URL: http://svnweb.freebsd.org/changeset/base/259144
Log:
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
Modified:
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 9 22:56:19 2013
(r259143)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 9 22:58:26 2013
(r259144)
@@ -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" \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
