From nobody@FreeBSD.org  Mon Sep 27 16:10:59 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AAB57106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Sep 2010 16:10:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 992628FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Sep 2010 16:10:59 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o8RGAxRc066284
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Sep 2010 16:10:59 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o8RGAxO3066259;
	Mon, 27 Sep 2010 16:10:59 GMT
	(envelope-from nobody)
Message-Id: <201009271610.o8RGAxO3066259@www.freebsd.org>
Date: Mon, 27 Sep 2010 16:10:59 GMT
From: Kris Moore <kmoore@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] pc-sysinstall(8) update to support latest GELI flags for passphrases
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         151002
>Category:       bin
>Synopsis:       [patch] pc-sysinstall(8) update to support latest GELI flags for passphrases
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    imp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 27 16:20:03 UTC 2010
>Closed-Date:    Thu Oct 21 11:15:40 MDT 2010
>Last-Modified:  Thu Oct 21 17:20:09 UTC 2010
>Originator:     Kris Moore
>Release:        9.0-Current
>Organization:
iXsystems
>Environment:
>Description:
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. 
>How-To-Repeat:

>Fix:
Apply included patch

Patch attached with submission follows:

--- src.o/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh	2010-09-22 08:50:07.000000000 -0400
+++ src/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh	2010-09-27 07:08:17.000000000 -0400
@@ -296,7 +296,7 @@
 
      # 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
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Sep 29 01:03:48 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151002 
State-Changed-From-To: open->closed 
State-Changed-By: imp 
State-Changed-When: Thu Oct 21 11:15:28 MDT 2010 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151002 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/151002: commit references a PR
Date: Thu, 21 Oct 2010 17:14:50 +0000 (UTC)

 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
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
