Date: Thu, 21 Oct 2010 17:14:44 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r214138 - head/usr.sbin/pc-sysinstall/backend Message-ID: <201010211714.o9LHEiAK097503@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010211714.o9LHEiAK097503>