svn commit: r217173 - head/usr.sbin/pc-sysinstall/backend-query

[Josh Paetzel]

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 at 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}