[Pkg-samba-maint] r1142 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-08-30 15:53:00 +0000 (Wed, 30 Aug 2006)
New Revision: 1142

Modified:
   trunk/changelog
   trunk/control
   trunk/panic-action
Log:
* Refined panic-action script text. Closes: #382500.

Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-08-26 18:53:45 UTC (rev 1141)
+++ trunk/changelog	2006-08-30 15:53:00 UTC (rev 1142)
@@ -21,6 +21,7 @@
   * Preseed configure result for method to detect interfaces in
     debian/config.cache; the test might otherwise fail if there are no
     interfaces configured at build time. Closes: #382429.
+  * Refined panic-action script text. Closes: #382500.
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 15 Aug 2006 08:01:30 -0500
 

Modified: trunk/control
===================================================================
--- trunk/control	2006-08-26 18:53:45 UTC (rev 1141)
+++ trunk/control	2006-08-30 15:53:00 UTC (rev 1142)
@@ -215,4 +215,3 @@
  .
  This package contains debugging symbols for the programs included in
  the samba and smbclient packages.
-

Modified: trunk/panic-action
===================================================================
--- trunk/panic-action	2006-08-26 18:53:45 UTC (rev 1141)
+++ trunk/panic-action	2006-08-30 15:53:00 UTC (rev 1142)
@@ -18,34 +18,36 @@
 
 	# Generic header for our email
 	echo "The Samba 'panic action' script, $0,"
-	echo "was called for pid $1 ($BINARYNAME)."
+	echo "was called for PID $1 ($BINARYNAME)."
 	echo
 
+	echo "This means there was a problem with the program, such as a segfault."
+
 	if [ -z "$BINARYNAME" ]; then
-		echo "This means there was a problem with the program, such as a segfault."
 		echo "However, the executable could not be found for process $1."
-		echo "It may have died unexpectedly, or you may not have permission to"
-		echo "debug the process."
+		echo "It may have died unexpectedly, or you may not have permission to debug"
+		echo "the process."
 		exit 1
 	fi
 
 	# No debugger
 	if [ ! -x /usr/bin/gdb ]; then
-		echo "This means there was a problem with the program, such as a segfault."
 		echo "However, gdb was not found on your system, so the error could not be"
-		echo "debugged.  Please install the gdb package so that debugging information is"
-		echo "available the next time such a problem occurs."
+		echo "debugged.  Please install the gdb package so that debugging information"
+		echo "is available the next time such a problem occurs."
 		exit 1
 	fi
 
 	echo "Below is a backtrace for this process generated with gdb, which shows"
-	echo "the state of the program at the time the error occurred. "
+	echo "the state of the program at the time the error occurred.  The Samba log"
+	echo "files may contain additional information about the problem."
 	echo 
-	echo "If the problem persists, you are encouraged to first install the "
-	echo "samba-dbg package which contains the debugging symbols for samba "
-	echo "binaries. Then submit the provided information as a bug report to Debian."
-	echo "For information about the procedure for submitting bug reports , please see"
-	echo "http://www.debian.org/Bugs/Reporting or the reportbug(1) manpage."
+	echo "If the problem persists, you are encouraged to first install the"
+	echo "samba-dbg package, which contains the debugging symbols for the Samba"
+	echo "binaries.  Then submit the provided information as a bug report to"
+	echo "Debian.  For information about the procedure for submitting bug reports,"
+	echo "please see http://www.debian.org/Bugs/Reporting or the reportbug(1)"
+	echo "manual page."
 	echo
 	gdb -x /etc/samba/gdbcommands -batch "$BINARYNAME" "$1"
-) | mail -s "Segfault in Samba" root
+) | mail -s "Panic or segfault in Samba" root