[PC-BSD Commits] r6439 - pcbsd/trunk/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-03-24 05:58:02 -0700 (Wed, 24 Mar 2010)
New Revision: 6439

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh
Log:

Added support for our patch to geli, allowing us to set passphrases during the install



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2010-03-24 12:54:31 UTC (rev 6438)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2010-03-24 12:58:02 UTC (rev 6439)
@@ -265,9 +265,7 @@
 
      # If we have a passphrase, set it up now
      if [ -e "${PARTDIR}-enc/${PART}-encpass" ] ; then
-       # KPM KPM KPM
-       # FIXME, geli needs to read passphrase from variable
-       geli setkey -n 0 -p -k ${KEYFILE} -K ${KEYFILE} ${PART}
+       cat ${PARTDIR}-enc/${PART}-encpass | geli setkey -S -n 0 -p -k ${KEYFILE} -K ${KEYFILE} ${PART}
        geli configure -b ${PART}
      fi