From nobody@FreeBSD.org  Fri Nov  5 16:57:32 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 8F025106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Nov 2010 16:57:32 +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 7CD998FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Nov 2010 16:57:32 +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 oA5GvWtB003259
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 5 Nov 2010 16:57:32 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id oA5GvWo1003258;
	Fri, 5 Nov 2010 16:57:32 GMT
	(envelope-from nobody)
Message-Id: <201011051657.oA5GvWo1003258@www.freebsd.org>
Date: Fri, 5 Nov 2010 16:57:32 GMT
From: Kris Moore <kmoore@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: src: usr.sbin/pc-sysinstall - Fix/improve debug log generation
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         151968
>Category:       bin
>Synopsis:       [patch] pc-sysinstall(8) - Fix/improve debug log generation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    imp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 05 17:00:18 UTC 2010
>Closed-Date:    Sat Jan 08 23:04:11 UTC 2011
>Last-Modified:  Sat Jan  8 23:10:07 UTC 2011
>Originator:     Kris Moore
>Release:        9.0-Current
>Organization:
iXsystems
>Environment:
9.0-Current
>Description:
This patch fixes an issue including a disk-listing when creating a debug log, and also removes passwords from the log file for the security minded. 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- src.o/usr.sbin/pc-sysinstall/backend-query/send-logs.sh	2010-11-05 12:05:56.951853683 -0400
+++ src/usr.sbin/pc-sysinstall/backend-query/send-logs.sh	2010-11-05 12:53:03.762601405 -0400
@@ -50,7 +50,7 @@
 then
   echo "" >>${TMPLOG}
   echo "# PC-SYSINSTALL CFG " >>${TMPLOG}
-  cat /tmp/sys-install.cfg >> ${TMPLOG}
+  cat /tmp/sys-install.cfg | grep -v 'rootPass' | grep -v 'userPass' >> ${TMPLOG}
 fi
 
 # Save dmesg output
@@ -59,7 +59,7 @@
 dmesg >> ${TMPLOG}
 
 # Get gpart info on all disks
-for i in `${PROGDIR}/pc-sysinstall disk-list | cut -d ':' -f 1`
+for i in `pc-sysinstall disk-list | cut -d ':' -f 1`
 do
   echo "" >>${TMPLOG}
   echo "# DISK INFO $i " >>${TMPLOG}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Nov 5 18:12:40 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151968 
State-Changed-From-To: open->closed 
State-Changed-By: jpaetzel 
State-Changed-When: Sat Jan 8 23:03:46 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/151968: commit references a PR
Date: Sat,  8 Jan 2011 23:03:30 +0000 (UTC)

 Author: jpaetzel (ports committer)
 Date: Sat Jan  8 23:03:24 2011
 New Revision: 217173
 URL: http://svn.freebsd.org/changeset/base/217173
 
 Log:
   Take passwords out of debug log.
   Fix path problem that was preventing disk info from being in the log.
   
   PR:	bin/151968
   Submitted by:	Kris Moore <kmoore@FreeBSD.org>
   Approved by:	imp
 
 Modified:
   head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh
 
 Modified: head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh	Sat Jan  8 23:00:38 2011	(r217172)
 +++ head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh	Sat Jan  8 23:03:24 2011	(r217173)
 @@ -50,7 +50,7 @@ if [ -e "/tmp/sys-install.cfg" ]
  then
    echo "" >>${TMPLOG}
    echo "# PC-SYSINSTALL CFG " >>${TMPLOG}
 -  cat /tmp/sys-install.cfg >> ${TMPLOG}
 +  cat /tmp/sys-install.cfg | grep -vE 'rootPass|userPass' >> ${TMPLOG}
  fi
  
  # Save dmesg output
 @@ -59,7 +59,7 @@ echo "# DMESG OUTPUT " >>${TMPLOG}
  dmesg >> ${TMPLOG}
  
  # Get gpart info on all disks
 -for i in `${PROGDIR}/pc-sysinstall disk-list | cut -d ':' -f 1`
 +for i in `pc-sysinstall disk-list | cut -d ':' -f 1`
  do
    echo "" >>${TMPLOG}
    echo "# DISK INFO $i " >>${TMPLOG}
 _______________________________________________
 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:
