diff options
| author | imp <imp@FreeBSD.org> | 2010-10-21 17:14:44 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-10-21 17:14:44 +0000 |
| commit | 32ef4e45e32095244c8d6b516b28c918fcfa50ea (patch) | |
| tree | 9410612aa1f1092a8d3e97f4b7900dec26f1d44b /usr.sbin/pc-sysinstall | |
| parent | 0806ef3ea2dece311389233faf4b899ebb0557cc (diff) | |
| download | FreeBSD-src-32ef4e45e32095244c8d6b516b28c918fcfa50ea.zip FreeBSD-src-32ef4e45e32095244c8d6b516b28c918fcfa50ea.tar.gz | |
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
Diffstat (limited to 'usr.sbin/pc-sysinstall')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-cleanup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh b/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh index 56e5389..bf2e467 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh @@ -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 |
