From owner-svn-src-head@FreeBSD.ORG  Sat Jan  8 23:03:25 2011
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 400B2106567A;
	Sat,  8 Jan 2011 23:03:25 +0000 (UTC)
	(envelope-from jpaetzel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2ED688FC27;
	Sat,  8 Jan 2011 23:03:25 +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 p08N3PAl019028;
	Sat, 8 Jan 2011 23:03:25 GMT (envelope-from jpaetzel@svn.freebsd.org)
Received: (from jpaetzel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p08N3PQU019026;
	Sat, 8 Jan 2011 23:03:25 GMT (envelope-from jpaetzel@svn.freebsd.org)
Message-Id: <201101082303.p08N3PQU019026@svn.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Sat, 8 Jan 2011 23:03:25 +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: r217173 - head/usr.sbin/pc-sysinstall/backend-query
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: Sat, 08 Jan 2011 23:03:25 -0000

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}