svn commit: r214138 - head/usr.sbin/pc-sysinstall/backend
Warner Losh
imp at FreeBSD.org
Thu Oct 21 17:14:45 UTC 2010
Author: imp
Date: Thu Oct 21 17:14:44 2010
New Revision: 214138
URL: http://svn.freebsd.org/changeset/base/214138
Log:
This small patch updates the "geli setkey" flags pc-sysinstall uses
when saving a users passphrase, to make it work in HEAD with recent
geli improvements.
Submitted by: Kris Moore
PR: 151002
Modified:
head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
Modified: head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh Thu Oct 21 17:05:15 2010 (r214137)
+++ head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh Thu Oct 21 17:14:44 2010 (r214138)
@@ -296,7 +296,7 @@ setup_geli_loading()
# If we have a passphrase, set it up now
if [ -e "${PARTDIR}-enc/${PART}-encpass" ] ; then
- cat ${PARTDIR}-enc/${PART}-encpass | geli setkey -S -n 0 -p -k ${KEYFILE} -K ${KEYFILE} ${PART}
+ geli setkey -J ${PARTDIR}-enc/${PART}-encpass -n 0 -p -k ${KEYFILE} -K ${KEYFILE} ${PART}
geli configure -b ${PART}
fi
More information about the svn-src-head
mailing list