[PC-BSD Commits] r6139 - pcbsd/trunk/pc-sysinstall/backend-query

[svn at pcbsd.org]

Author: kris
Date: 2010-02-01 07:30:13 -0800 (Mon, 01 Feb 2010)
New Revision: 6139

Modified:
   pcbsd/trunk/pc-sysinstall/backend-query/send-logs.sh
Log:

Changed error logging script, don't try to e-mail, since that doesn't work
without smtp and such, give user location and let them view log



Modified: pcbsd/trunk/pc-sysinstall/backend-query/send-logs.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend-query/send-logs.sh	2010-02-01 15:19:59 UTC (rev 6138)
+++ pcbsd/trunk/pc-sysinstall/backend-query/send-logs.sh	2010-02-01 15:30:13 UTC (rev 6139)
@@ -7,6 +7,8 @@
 . ${BACKEND}/functions-networking.sh
 . ${BACKEND}/functions-parse.sh
 
+# Bring up all NICS under DHCP
+enable_auto_dhcp
 
 MAILTO="$1"
 MAILRESULT="0"
@@ -47,29 +49,9 @@
 echo "Log file saved to ${TMPLOG}"
 echo "Warning: This file will be lost once the system is rebooted."
 
-# Check if we need to mail the log somewhere
-if [ ! -z "$MAILTO" ]
+echo "Do you wish to view this logfile now? (Y/N)"
+read tmp
+if [ "$tmp" = "Y" -o "$tmp" = "y" ]
 then
-  if [ "${MAILTO}" = "interactive" ]
-  then
-    echo "Do you wish to e-mail a copy of this logfile? (Y/N)"
-    read tmp
-    if [ "$tmp" = "Y" -o "$tmp" = "y" ]
-    then
-      echo "Please enter the e-mail address:"
-      read MAILTO
-      # Bring up all NICS under DHCP
-      echo "Enabling DHCP on all NICs"
-      enable_auto_dhcp
-      echo "Sending a copy of log to ${MAILTO}"
-      cat ${TMPLOG} | mail -s "Error report from pc-sysinstall" ${MAILTO}
-    fi
-
-    echo "Press ENTER to exit"
-    read tmp
-  else
-    # Bring up all NICS under DHCP
-    enable_auto_dhcp
-    cat ${TMPLOG} | mail -s "Error report from pc-sysinstall" ${MAILTO}
-  fi
+  more ${TMPLOG}
 fi