rpms/netdump-server/EL-5 netdump-dumpdir-docs-scripts.patch, NONE, 1.1 netdump-dumpdir.patch, NONE, 1.1 netdump-init-typo.patch, NONE, 1.1 netdump-localport-option.patch, NONE, 1.1 netdump-makefile-servonly.patch, NONE, 1.1 netdump-retrans-on-log.patch, NONE, 1.1 netdump-server-Makefile.patch, NONE, 1.1 netdump-server-init.patch, NONE, 1.1 netdump-server.spec, NONE, 1.1 netdump-server.sysconfig, NONE, 1.1 netdump-verbose-logging.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Neil Horman (nhorman) fedora-extras-commits at redhat.com
Fri Dec 14 00:26:40 UTC 2007 

Author: nhorman

Update of /cvs/extras/rpms/netdump-server/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11378

Modified Files:
	.cvsignore sources 
Added Files:
	netdump-dumpdir-docs-scripts.patch netdump-dumpdir.patch 
	netdump-init-typo.patch netdump-localport-option.patch 
	netdump-makefile-servonly.patch netdump-retrans-on-log.patch 
	netdump-server-Makefile.patch netdump-server-init.patch 
	netdump-server.spec netdump-server.sysconfig 
	netdump-verbose-logging.patch 
Log Message:
Importing initial files

netdump-dumpdir-docs-scripts.patch:

--- NEW FILE netdump-dumpdir-docs-scripts.patch ---
--- netdump-0.7.16/netdump-server.init.orig	2007-02-13 10:52:37.000000000 -0500
+++ netdump-0.7.16/netdump-server.init	2007-02-13 10:54:18.000000000 -0500
@@ -14,12 +14,15 @@
 
 [ -f /usr/sbin/netdump-server ] || exit 1
 
+[ -f /etc/sysconfig/netdump-server ] || exit 0
+. /etc/sysconfig/netdump-server
+
 RETVAL=0
 
 start(){
 	# Start daemons.
 	echo -n "Starting netdump server: "
-	daemon --user netdump /usr/sbin/netdump-server --daemon
+	daemon --user netdump /usr/sbin/netdump-server --daemon $SERVER_OPTS
 	RETVAL=$?
 	echo
 	touch /var/lock/subsys/netdump-server
--- netdump-0.7.16/netdump-server.8.orig	2007-02-13 10:48:01.000000000 -0500
+++ netdump-0.7.16/netdump-server.8	2007-02-13 10:49:42.000000000 -0500
@@ -24,6 +24,7 @@
 .B \ \ \ \ \ \ \ \ \ [--addr \fIaddress\fP]
 .B \ \ \ \ \ \ \ \ \ [--concurrent \fInumber\fP]
 .B \ \ \ \ \ \ \ \ \ [--pidfile \fIpath\fP]
+.B \ \ \ \ \ \ \ \ \ [--dumpdir \fIpath\fP]
 .B \ \ \ \ \ \ \ \ \ [--daemon]
 .B \ \ \ \ \ \ \ \ \ [--secure <\fI0|1\fP>]
 .B \ \ \ \ \ \ \ \ \ [--help] [--usage]
@@ -51,6 +52,10 @@
 time. If more clients than the specified maximum connects at one time
 the last ones will just be logged and then rebooted.
 .TP
+--dumpdir \fIpath\fP
+Specify the location where received vmcore files are saved.  Defaults to
+/var/crash
+.TP
 --pidfile \fIpath\fP
 Store a pidfile.  The default service uses /var/run/netdump-server.pid.
 The default is not to write a pidfile.

netdump-dumpdir.patch:

--- NEW FILE netdump-dumpdir.patch ---
--- netdump-0.7.16/server.c.orig	2006-01-23 14:37:11.000000000 -0500
+++ netdump-0.7.16/server.c	2006-07-14 14:52:04.000000000 -0400
@@ -70,7 +70,7 @@ get_dir_from_ip (guint32 ip, gboolean cr
       dir = g_new (CrashDir, 1);
       dir->time = now;
       dir->path = g_strdup_printf ("%s/%d.%d.%d.%d-%s",
-				   NETDUMP_DIR_PREFIX,
+				   config.dir_prefix,
 				   (ip >> 24) & 0xff,
 				   (ip >> 16) & 0xff,
 				   (ip >> 8) & 0xff,
@@ -122,7 +122,7 @@ execute_script (const char *script,
   char *cmdline;
   int res = -1;
 
-  filename = g_strconcat (NETDUMP_DIR_PREFIX "/scripts/",
+  filename = g_strconcat (config.dir_prefix, "/scripts/",
 			  script,
 			  NULL);
   
@@ -169,7 +169,7 @@ load_magic (guint32 ip, guchar magic[MAG
     }
 
   path = g_strdup_printf ("%s/magic/%d.%d.%d.%d",
-			 NETDUMP_DIR_PREFIX,
+			 config.dir_prefix,
 			 (ip >> 24) & 0xff,
 			 (ip >> 16) & 0xff,
 			 (ip >> 8) & 0xff,
@@ -413,10 +413,10 @@ main (int argc, char *argv[])
 
   openlog("netdump", LOG_PID, LOG_DAEMON);
 
-  if (chdir (NETDUMP_DIR_PREFIX) == -1)
+  if (chdir (config.dir_prefix) == -1)
     {
-      syslog (LOG_ERR, "can't cd to %s", NETDUMP_DIR_PREFIX);
-      fprintf (stderr, "can't cd to %s", NETDUMP_DIR_PREFIX);
+      syslog (LOG_ERR, "can't cd to %s", config.dir_prefix);
+      fprintf (stderr, "can't cd to %s", config.dir_prefix);
       exit (1);
     }
   
--- netdump-0.7.16/configuration.h.orig	2006-01-23 14:37:11.000000000 -0500
+++ netdump-0.7.16/configuration.h	2006-07-14 14:52:04.000000000 -0400
@@ -14,6 +14,7 @@ typedef struct {
   char *compress;
   int skip_zero;
   int debug;
+  char *dir_prefix;
 } NetdumpConfiguration;
 
 extern NetdumpConfiguration config;
--- netdump-0.7.16/configuration.c.orig	2006-01-23 14:37:11.000000000 -0500
+++ netdump-0.7.16/configuration.c	2006-07-14 15:13:05.000000000 -0400
@@ -46,6 +46,7 @@ struct ConfigData config_data[] =
   { "addr", CONFIG_STRING, CONFIG_OFFSET(addr), NULL },
   { "max_concurrent_dumps", CONFIG_INT, CONFIG_OFFSET(max_concurrent_dumps), GINT_TO_POINTER (4) },
   { "daemon", CONFIG_BOOLEAN, CONFIG_OFFSET(daemon), GINT_TO_POINTER (0) },
+  { "dumpdir", CONFIG_STRING, CONFIG_OFFSET(dir_prefix), NETDUMP_DIR_PREFIX },
   { "pidfile", CONFIG_STRING, CONFIG_OFFSET(pidfile), NULL },
   { "secure", CONFIG_INT, CONFIG_OFFSET(secure), GINT_TO_POINTER (1) },
   { "space_check", CONFIG_INT, CONFIG_OFFSET(space_check), GINT_TO_POINTER (1) },
@@ -278,6 +279,8 @@ static struct poptOption optionsTable[] 
       "ip port to listen on", "6666" },
     { "addr", 'a', POPT_ARG_STRING, &config.addr, 0,
       "ip address to bind server to", "any" },
+    { "dumpdir", 'C', POPT_ARG_STRING, &config.dir_prefix, 'C',
+      "directory to store dumps", "directory" },
     { "concurrent", 'c', POPT_ARG_INT, &config.max_concurrent_dumps, 0,
       "max number of concurrent dumps", "4" },
     { "daemon", 'd', POPT_ARG_NONE, &config.daemon, 0,

netdump-init-typo.patch:

--- NEW FILE netdump-init-typo.patch ---
--- netdump-0.7.16/netdump.init.orig	2006-06-20 15:28:46.000000000 -0400
+++ netdump-0.7.16/netdump.init	2006-06-20 15:30:19.000000000 -0400
@@ -294,7 +294,7 @@ start ()
 	    else
 		IPADDR="$NETLOGADDR"
 	    fi
-	    NETLOGOPTS="netlog=@$LOCALDDR/$DEV,$NETLOGPORT@$IPADDR/$NETLOGMACADDR "
+	    NETLOGOPTS="netlog=@$LOCALADDR/$DEV,$NETLOGPORT@$IPADDR/$NETLOGMACADDR "
 	fi
     fi
 

netdump-localport-option.patch:

--- NEW FILE netdump-localport-option.patch ---
--- netdump-0.7.16/netdump.init.orig	2006-06-21 13:58:09.000000000 -0400
+++ netdump-0.7.16/netdump.init	2006-06-21 14:00:48.000000000 -0400
@@ -254,7 +254,7 @@ start ()
 	    $TGTMAC $MHZ $IDLETIMEOUT"
 	else
 	    NETDUMPOPTS=$NETDUMPOPTS"\
-	    netdump=@$LOCALADDR/$DEV,$NETDUMPPORT@$IPADDR/$NETDUMPMACADDR"
+	    netdump=$LOCALPORT@$LOCALADDR/$DEV,$NETDUMPPORT@$IPADDR/$NETDUMPMACADDR"
 	fi
     else
 	# The netdump subsystem of the netconsole module is not configured.
@@ -331,7 +331,7 @@ start ()
 	if [ $kernel = 2.4 ]; then
 	    SYSLOGOPTS="syslog_target_ip=$SYSLOGIPHEX syslog_target_port=$SYSLOGPORT $SYSLOGMAC"
 	else
-	    SYSLOGOPTS="netconsole=@$LOCALADDR/$DEV,$SYSLOGPORT@$SYSLOGADDR/$SYSLOGMACADDR "
+	    SYSLOGOPTS="netconsole=$LOCALPORT@$LOCALADDR/$DEV,$SYSLOGPORT@$IPADDR/$SYSLOGMACADDR "
 	fi
     fi
 

netdump-makefile-servonly.patch:

--- NEW FILE netdump-makefile-servonly.patch ---
diff -up netdump-0.7.16/Makefile.orig netdump-0.7.16/Makefile
--- netdump-0.7.16/Makefile.orig	2005-03-01 12:33:03.000000000 -0500
+++ netdump-0.7.16/Makefile	2007-11-12 15:47:45.000000000 -0500
@@ -31,14 +31,10 @@ install: netdump-server
 	mkdir -p $(DESTDIR)/etc/sysconfig
 	mkdir -p $(DESTDIR)/etc/rc.d/init.d
 	cp netdump-server $(DESTDIR)/usr/sbin
-	cp netdump.sysconfig $(DESTDIR)/etc/sysconfig/netdump
-	cp netdump.init $(DESTDIR)/etc/rc.d/init.d/netdump
-	chmod a+x $(DESTDIR)/etc/rc.d/init.d/netdump
 	cp netdump-server.init $(DESTDIR)/etc/rc.d/init.d/netdump-server
 	chmod a+x $(DESTDIR)/etc/rc.d/init.d/netdump-server
 	mkdir -p $(DESTDIR)/usr/share/man/man8
 	cp netdump-server.8 $(DESTDIR)/usr/share/man/man8
-	cp netdump.8 $(DESTDIR)/usr/share/man/man8
 
 
 tag-archive:

netdump-retrans-on-log.patch:

--- NEW FILE netdump-retrans-on-log.patch ---
--- netdump-0.7.16/netdumpclient.c.orig	2007-02-26 14:44:48.000000000 -0500
+++ netdump-0.7.16/netdumpclient.c	2007-02-26 14:55:42.000000000 -0500
@@ -2471,8 +2471,15 @@ status_timeout (NetdumpClient *client,
     status_request (client, FALSE);
   else
     {
-      syslog (LOG_WARNING, "Got too many timeouts waiting for SHOW_STATUS for client %s, rebooting it\n", client->ip_addr);
-      netdump_client_destroy (client, TRUE);
+	if (client->got_log_packet) {
+		/* keep trying if we are getting log messages */
+		client->got_log_packet = FALSE;
+		client->process_packet = status_packet;  /* may not be necessary */
+		client->timeout = status_timeout;  /* may not be necessary */
+      	} else {
+	      syslog (LOG_WARNING, "Got too many timeouts waiting for SHOW_STATUS for client %s, rebooting it\n", client->ip_addr);
+	      netdump_client_destroy (client, TRUE);
+	}
     }
 }
 

netdump-server-Makefile.patch:

--- NEW FILE netdump-server-Makefile.patch ---
diff -up netdump-0.7.16/Makefile.orig netdump-0.7.16/Makefile
--- netdump-0.7.16/Makefile.orig	2007-12-03 13:00:11.000000000 -0500
+++ netdump-0.7.16/Makefile	2007-12-03 13:02:38.000000000 -0500
@@ -1,6 +1,5 @@
 DEBUG_FLAGS=-Wall -g
 
-CFLAGS=`glib-config --cflags` $(DEBUG_FLAGS) -D_FILE_OFFSET_BITS=64
 LDFLAGS=`glib-config --libs` -lpopt
 
 VERSION=$(shell awk '/Version:/ { print $$2 }' netdump.spec)
@@ -21,12 +20,12 @@ netdump-server: server.o netdumpclient.o
 	gcc -o netdump-server server.o netdumpclient.o configuration.o $(LDFLAGS)
 
 install: netdump-server
-	mkdir -p $(DESTDIR)/var/crash
-	mkdir -p $(DESTDIR)/var/crash/scripts
-	mkdir -m 700 -p $(DESTDIR)/var/crash/magic
-	mkdir -m 700 -p $(DESTDIR)/var/crash/.ssh
-	touch $(DESTDIR)/var/crash/.ssh/authorized_keys2
-	chmod u=rw,go= $(DESTDIR)/var/crash/.ssh/authorized_keys2
+	mkdir -p $(DESTDIR)/var/netdump/crash
+	mkdir -p $(DESTDIR)/var/netdump/crash/scripts
+	mkdir -m 700 -p $(DESTDIR)/var/netdump/crash/magic
+	mkdir -m 700 -p $(DESTDIR)/var/netdump/crash/.ssh
+	echo "#netdump stores client keys here" > $(DESTDIR)/var/netdump/crash/.ssh/authorized_keys2
+	chmod u=rw,go= $(DESTDIR)/var/netdump/crash/.ssh/authorized_keys2
 	mkdir -p $(DESTDIR)/usr/sbin
 	mkdir -p $(DESTDIR)/etc/sysconfig
 	mkdir -p $(DESTDIR)/etc/rc.d/init.d

netdump-server-init.patch:

--- NEW FILE netdump-server-init.patch ---
diff -up netdump-0.7.16/netdump.init.orig netdump-0.7.16/netdump.init
--- netdump-0.7.16/netdump.init.orig	2007-12-03 12:57:37.000000000 -0500
+++ netdump-0.7.16/netdump.init	2007-12-03 12:58:11.000000000 -0500
@@ -219,7 +219,7 @@ start ()
     	    NETDUMPOPTS="magic1=0x11111111 magic2=0x11111111 "
     	    ;;
         *)
-    	    ssh -x -i /etc/sysconfig/netdump_id_dsa netdump@$NETDUMPADDR echo "$MAGIC2$MAGIC1" \> /var/crash/magic/$LOCALADDR
+    	    ssh -x -i /etc/sysconfig/netdump_id_dsa netdump@$NETDUMPADDR echo "$MAGIC2$MAGIC1" \> /var/netdump/crash/magic/$LOCALADDR
     	    if [ $? -ne 0 ]; then
     		echo "$prog: could not ssh to server $NETDUMPADDR"
     		netdump_failure "netdump server ssh key exchange"
@@ -404,7 +404,7 @@ propagate ()
 {
     # propagate netdump ssh public key to the crashdump server
     cat /etc/sysconfig/netdump_id_dsa.pub | \
-	ssh -x netdump@$NETDUMPADDR cat '>>' /var/crash/.ssh/authorized_keys2
+	ssh -x netdump@$NETDUMPADDR cat '>>' /var/netdump/crash/.ssh/authorized_keys2
 }
 
 case "$1" in


--- NEW FILE netdump-server.spec ---
Summary: Server for network kernel message logging and crash dumps
Name: netdump-server
Version: 0.7.16
Release: 20%{dist}
# This is a Red Hat maintained package which is specific to
# our distribution.  Thus the source is only available from
# within this srpm.
Source0: netdump-%{version}.tar.gz
Source1: netdump-server.sysconfig
License: GPLv2
Group: System Environment/Daemons
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
BuildRequires: glib-devel popt-devel
Requires: /usr/bin/ssh-keygen /usr/bin/ssh fileutils textutils gawk /sbin/ifconfig
Requires(pre): shadow-utils
Requires(postun): /sbin/service

Patch0: netdump-init-typo.patch
Patch1: netdump-localport-option.patch 
Patch2: netdump-dumpdir.patch
Patch3: netdump-dumpdir-docs-scripts.patch
Patch4: netdump-retrans-on-log.patch
Patch5: netdump-verbose-logging.patch
Patch6: netdump-makefile-servonly.patch
Patch7: netdump-server-Makefile.patch
Patch8: netdump-server-init.patch

Group: System Environment/Daemons

%description
The netdump server listens to the network for crashed kernels to
contact it and then writes the oops log and a memory dump to
/var/netdump/crash before asking the crashed machine to reboot.

%prep
%setup -q -n netdump-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1

%build
export CFLAGS="%{optflags} %{?_smp_mflags} `glib-config --cflags`"; make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT make install
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/netdump-server

%clean
rm -rf $RPM_BUILD_ROOT


%pre
getent group netdump >/dev/null || groupadd -r -g 34 -f netdump 
getent passwd netdump >/dev/null || \
useradd -r -u 34 -g netdump -d /var/netdump/crash/netdump -s /bin/bash \
	-c "Network Crash Dump user" netdump 
exit 0

%post
/sbin/chkconfig --add netdump-server

%postun
if [ $1 -ge 1 ]; then
	service netdump-server condrestart > /dev/null 2>&1
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service netdump-server stop > /dev/null 2>&1
	/sbin/chkconfig --del netdump-server
fi


%files
%defattr(-,root,root)
/usr/sbin/netdump-server
%config(noreplace) %attr(0644,root,root)/etc/sysconfig/netdump-server
%dir %attr(-,netdump,netdump)/var/netdump/crash
%dir %attr(0700,netdump,netdump)/var/netdump/crash/.ssh
%config(noreplace) %attr(0600,netdump,netdump)/var/netdump/crash/.ssh/authorized_keys2
%dir %attr(0700,netdump,netdump)/var/netdump/crash/magic
%dir %attr(-,netdump,netdump)/var/netdump/crash/scripts
/etc/rc.d/init.d/netdump-server
%{_mandir}/man8/netdump-server.8*
%doc README
%doc COPYING

%changelog
* Wed Dec 12 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-20
- Fixing licensing issues to be unambiguously GPLv2

* Tue Dec 04 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-19
- More fixes for EPEL review

* Mon Dec 03 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-18
- More fixes for EPEL review

* Mon Nov 26 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-17
- More fixes for EPEL review

* Mon Nov 20 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-16
- Fixed spec file for rpmlint/review

* Mon Nov 12 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-15
- Updating for EPEL inclusion

* Fri Mar 09 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-13
- Add verbose logging to netdump
- fixed up packaging error

* Mon Mar 05 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-11
- Allow netdump-server to retrans as long as we get log data (bz 226701)

* Tue Feb 13 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-10
- update netdump-server with docs/scripts for bz 198863

* Thu Jan 18 2007 Neil Horman <nhorman at redhat.com> - 0.7.16-9
- update netdump-server to allow for configurable dump directory (bz 198863)

* Wed Oct 18 2006 Neil Horman <nhorman at redhat.com> - 0.7.16-8
- update previous initscript patch to pass ipaddr to netconsole (bz 211283)

* Wed Jun 21 2006 Neil Horman <nhorman at redhat.com> - 0.7.16-4
- fix netdump to pass localport option to kernel in RHEL4

* Tue Jun 20 2006 Neil Horman <nhorman at redhat.com> - 0.7.16-3
- fix typo in init script (bz 186625)

* Tue Apr 25 2006 Thomas Graf <tgraf at redhat.com> - 0.7.16-1
- update to version 0.7.16

* Mon Nov 21 2005 Dave Anderson <anderson at redhat.com> - 0.7.14-4
- Updated source package to netdump- 0.7.14.tar.gz:
  Creates target /var/crash/ directory on the fly if it does not
  exist or has been removed.  BZ #162587 (RHEL3 BZ #162586)
  Close vmcore before netdump-reboot script is run, allowing
  unimpeded usage of the file by a custom script.  (RHEL3 BZ #165100)
  Made /etc/sysconfig/netdump config(noreplace)  (RHEL3 BZ #168601)
  Generate syslog messages if any script fails to execute.
  Use sparse file space in vmcore if page is zero-filled.
  Update README.client re: usage of alt-sysrq-c for forced crashes.
  Cleaned up numerous compiler warnings seen in Fedora build environment.

* Mon Aug  1 2005 Jeff Moyer <jmoyer at redhat.com> - 0.7.10-3
- If the sysconfig file specifies all of the needed information, then don't
  fail in the event that the server is either unreachable or the name is
  unresolvable at load time.  BZ #161513

* Tue Mar  1 2005 Jeff Moyer <jmoyer at redhat.com> - 0.7.7-3
- Add support for auto-detecting the first hop on the way to the netdump
  server.

* Tue Dec 21 2004 Dave Anderson <anderson at redhat.com> - 0.7.5-2
- Updated source package to netdump- 0.7.5.tar.gz:
  Allows multiple "service netdump start" to handle magic numbers
  properly.  BZ #142752

* Tue Nov 30 2004 Dave Anderson <anderson at redhat.com> - 0.7.4-2
- Fix for unintentional failure of netconsole modprobe when NETLOGADDR=NONE.
  BZ #141373.

* Wed Nov 24 2004 Dave Anderson <anderson at redhat.com> - 0.7.3-2
- Replaces "set" usage with "read" for gathering arp output in
  print_address_info().  BZ #139781.
- Convert netdump-server.8 man page to UTF-8 format.  BZ #140707

* Mon Nov 22 2004 Dave Anderson <anderson at redhat.com> - 0.7.1-2
- Changed netdump.init file to use "set -f" in print_address_info().
  Fixes "service netdump start" bug if /e, /t, /h, or /r files exist,
  i.e., characters in "ether".

* Mon Nov 15 2004 Dave Anderson <anderson at redhat.com> - 0.7.0-2
- rebuild for RHEL-4

* Wed Sep 29 2004 Dave Anderson <anderson at redhat.com>  - 0.7.0-1
- Added BuildRequires and updated to latest package

* Fri Jul  9 2004 Jeff Moyer <jmoyer at redhat.com> - 0.6.13-1
- More init script fixes.  Namely, don't load netdump module if netdumpaddr 
  isn't filled in.

* Thu Jul  8 2004 Jeff Moyer <jmoyer at redhat.com> - 0.6.12-1
- Add support for 2.6 netdump.
- Allow netlog to be configured indepndently from netdump.
- Change the server to create only one directory in /var/crash per boot
  of a system.

* Tue Nov 02 2003 Dave Anderson <anderson at redhat.com> - 0.6.11-3
- rebuild

* Tue Nov 02 2003 Dave Anderson <anderson at redhat.com> - 0.6.11-2
- fix config_init() in configuration.c to work with PPC64. 
- fix netdump.init to allow SYSLOGADDR to be configured w/o NETDUMPADDR, and
- to properly handle configuration errors.

* Thu Oct 23 2003 Jeff Moyer <jmoyer at redhat.com> - 0.6.11-1
- Incorporate the latest netdump sources.  See file ChangeLog.

* Wed Sep 10 2003 Dave Anderson <anderson at redhat.com> - 0.6.10-2
- correct README.client to indicate netdump password (instead of root)

* Fri Aug 15 2003 Michael K. Johnson <johnsonm at redhat.com> - 0.6.10-1
- make iconv happy with man page

* Tue Aug 05 2003 Michael K. Johnson <johnsonm at redhat.com> - 0.6.9-4
- rebuild

* Mon Aug 04 2003 Michael K. Johnson <johnsonm at redhat.com> - 0.6.9-3
- rebuild

* Mon Jul 07 2003 Dave Anderson <anderson at redhat.com> - 0.6.9-2
- memory_packet(): cast lseek() offset argument as off_t to avoid wrap-around.
- memory_remove_outstanding_timeouts(): remove return arg to avoid warning.
 
* Mon Mar 17 2003 Michael K. Johnson <johnsonm at redhat.com> - 0.6.9-1
- fixed references to ttywatch instead of netdump-server in man page

* Wed Feb 26 2003 Dave Anderson <anderson at redhat.com> - 0.6.8-3
- built 0.6.7-1.1 for AS2.1 errata; bumped to 0.6.8-3 for future builds

* Tue Jan 28 2003 Michael K. Johnson <johnsonm at redhat.com> - 0.6.8-2
- rebuild

* Fri Dec 13 2002 Elliot Lee <sopwith at redhat.com>
- Rebuild

* Fri Apr 12 2002 Michael K. Johnson <johnsonm at redhat.com>
- added call to condrestart

* Tue Apr 02 2002 Michael K. Johnson <johnsonm at redhat.com>
- mhz separated from IDLETIMEOUT

* Thu Mar 21 2002 Michael K. Johnson <johnsonm at redhat.com>
- netdump and syslog disassociated

* Thu Mar 21 2002 Michael K. Johnson <johnsonm at redhat.com>
- added IDLETIMEOUT

* Tue Mar 19 2002 Michael K. Johnson <johnsonm at redhat.com>
- netconsole module now does arp, netdump-arphelper no longer needed

* Mon Mar 18 2002 Michael K. Johnson <johnsonm at redhat.com>
- special netdump dsa key

* Fri Mar 15 2002 Michael K. Johnson <johnsonm at redhat.com>
- added syslog setup

* Thu Mar 14 2002 Michael K. Johnson <johnsonm at redhat.com>
- netdump-client -> netdump
- finish ssh setup in netdump package

* Tue Feb 19 2002 Alex Larsson <alexl at redhat.com>
- shut up post scripts

* Tue Dec 18 2001 Alex Larsson <alexl at redhat.com>
- Update version to 0.2

* Thu Dec  6 2001 Alex Larsson <alexl at redhat.com>
- Initial build.


--- NEW FILE netdump-server.sysconfig ---
#This File allows system adminstrators to configure the netdump-server service.
#Specifically it allows the sysadmin to specify the options to pass to the
#netdump-server binary, as specified in the netdump-server(8) man page. 
#NOTE: passing the --daemon option is not necessecary as the service startup
#script allready apends it

#Uncomment the next line to list options to specify for netdump-server
#SERVER_OPTS=""

netdump-verbose-logging.patch:

--- NEW FILE netdump-verbose-logging.patch ---
--- netdump-0.7.16/configuration.h.orig	2007-03-09 11:49:57.000000000 -0500
+++ netdump-0.7.16/configuration.h	2007-03-09 11:50:07.000000000 -0500
@@ -14,6 +14,7 @@ typedef struct {
   char *compress;
   int skip_zero;
   int debug;
+  int verbose;
   char *dir_prefix;
 } NetdumpConfiguration;
 
--- netdump-0.7.16/netdumpclient.c.orig	2007-03-09 11:47:54.000000000 -0500
+++ netdump-0.7.16/netdumpclient.c	2007-03-09 11:49:11.000000000 -0500
@@ -187,6 +187,11 @@ netdump_client_destroy (NetdumpClient *c
   int i;
   char *compress_func, *compress_command = NULL;
 
+  /* Log netdump-server status */
+  if (config_verbose())
+    {
+      syslog (LOG_INFO, "   server rebooting %s.\n", client->ip_addr);
+    }
 #ifdef DEBUG
   g_print (" netdump_client_destroy(%p, reboot=%d)\n", client, reboot);
 #endif
@@ -982,6 +987,12 @@ memory_request (NetdumpClient *client, g
 
       g_free (file);
 
+      /* Log netdump-server status */
+      if (config_verbose())
+      {
+        syslog (LOG_INFO, "   server generating elf header for %s.", client->ip_addr);
+      }
+
       switch (client->machine_type)
       {
       case EM_386:
@@ -1076,9 +1087,22 @@ memory_request (NetdumpClient *client, g
 	}
     }
 
+    /* Log netdump-server status */
+    if (config_verbose() && client->current_page % (guint32)(client->nr_pages / 10) == 0)
+    {
+        syslog (LOG_INFO, "   server received %d0%% of pages from %s.\n", \
+            (int)(client->current_page / (guint32)(client->nr_pages / 10)), client->ip_addr);
+    }
+
   /* Did we finish dumping all memory */
   if ((client->current_page == client->nr_pages) && !has_active)
     {
+      /* Log netdump-server status */
+      if (config_verbose())
+      {
+          syslog (LOG_INFO, "   server creating /vmcore for %s.\n", client->ip_addr);
+      }
+
       char *old_file;
       char *new_file;
       
@@ -1177,6 +1201,12 @@ memory_packet (NetdumpClient *client,
   gboolean done;
   int offset;
 
+  /* Log netdump-server status */
+  if (config_verbose())
+    {
+      syslog (LOG_INFO, "   server handling status information from %s\n", client->ip_addr);
+    }
+
   if (parse_packet (buffer, buf_len, &reply))
     {
       syslog (LOG_WARNING, "Got invalid packet from %s\n", client->ip_addr);
--- netdump-0.7.16/server.c.orig	2007-03-09 11:47:54.000000000 -0500
+++ netdump-0.7.16/server.c	2007-03-09 11:49:11.000000000 -0500
@@ -536,6 +536,13 @@ config_debug_level(void)
         return config.debug;
 }
 
+
+int
+config_verbose(void)
+{
+        return config.verbose;
+}
+
 int
 config_load_segments(NetdumpClient *client)
 {
--- netdump-0.7.16/configuration.c.orig	2007-03-09 11:47:54.000000000 -0500
+++ netdump-0.7.16/configuration.c	2007-03-09 11:49:11.000000000 -0500
@@ -301,6 +301,8 @@ static struct poptOption optionsTable[] 
       "skip zero-filled pages in vmcore file", "1" },
     { "debug", 'D', POPT_ARG_INT, &config.debug, 0,
       "debug level", "0" },
+    { "verbose", 'v', POPT_ARG_INT, &config.verbose, 0,
+      "verbose output", "0" },
       POPT_AUTOHELP
     { NULL, 0, 0, NULL, 0 }
 };
--- netdump-0.7.16/server.h.orig	2005-10-03 15:07:29.000000000 -0400
+++ netdump-0.7.16/server.h	2007-03-09 11:49:11.000000000 -0500
@@ -21,6 +21,7 @@ gboolean perform_space_check (void);
 int config_load_segments(NetdumpClient *client);
 int config_hole_size(void);
 int config_debug_level(void);
+int config_verbose(void);
 char *config_compress(void);
 int config_skip_zero(void);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netdump-server/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2007 19:11:18 -0000	1.1
+++ .cvsignore	14 Dec 2007 00:26:00 -0000	1.2
@@ -0,0 +1 @@
+netdump-0.7.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netdump-server/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2007 19:11:18 -0000	1.1
+++ sources	14 Dec 2007 00:26:00 -0000	1.2
@@ -0,0 +1 @@
+dfeeeae78488731bcea39c8509488576  netdump-0.7.16.tar.gz

More information about the fedora-extras-commits mailing list