From owner-svn-src-head@FreeBSD.ORG  Thu Oct 21 17:14:45 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BE75106566B;
	Thu, 21 Oct 2010 17:14:45 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EFC488FC15;
	Thu, 21 Oct 2010 17:14:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9LHEibC097505;
	Thu, 21 Oct 2010 17:14:44 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9LHEiAK097503;
	Thu, 21 Oct 2010 17:14:44 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201010211714.o9LHEiAK097503@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 21 Oct 2010 17:14:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214138 - head/usr.sbin/pc-sysinstall/backend
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Oct 2010 17:14:45 -0000

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