rpms/netdump/FC-5 netdump-disable-netdump.patch, NONE, 1.1 netdump.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: nhorman

Update of /cvs/dist/rpms/netdump/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23781

Modified Files:
	netdump.spec 
Added Files:
	netdump-disable-netdump.patch 
Log Message:
Resolves: bz197272

netdump-disable-netdump.patch:
 netdump.init |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE netdump-disable-netdump.patch ---
--- netdump-0.7.14/netdump.init.orig	2006-11-28 15:25:04.000000000 -0500
+++ netdump-0.7.14/netdump.init	2006-11-28 15:33:09.000000000 -0500
@@ -45,6 +45,7 @@
 NETLOGMACADDR=
 NETLOGPORT=
 
+KERNEL_VERSION=`uname -r`
 kernel=`uname -r | cut -d. -f1-2`
 
 [ -f /etc/sysconfig/netdump ] || exit 0
@@ -272,7 +273,7 @@
     if [ $kernel = 2.6 ]; then
 	# Make these the same as netdump opts
 	if [ -z $NETLOGADDR ]; then
-	    NETLOGOPTS="netlog=@$LOCALADDR/$DEV,$NETDUMPPORT@$netdump_numeric_ip/$NETDUMPMACADDR"
+	    NETLOGOPTS="netconsole=@$LOCALADDR/$DEV,$NETDUMPPORT@$netdump_numeric_ip/$NETDUMPMACADDR"
 	elif [ $NETLOGADDR = "NONE" ]; then
 	    NETLOGOPTS=
 	elif [ -n "$NETLOGADDR" ]; then
@@ -294,7 +295,7 @@
 	    else
 		IPADDR="$NETLOGADDR"
 	    fi
-	    NETLOGOPTS="netlog=@$LOCALDDR/$DEV,$NETLOGPORT@$IPADDR/$NETLOGMACADDR "
+	    NETLOGOPTS="netconsole=@$LOCALDDR/$DEV,$NETLOGPORT@$IPADDR/$NETLOGMACADDR "
 	fi
     fi
 
@@ -342,6 +343,10 @@
 	    $NETDUMPOPTS $SYSLOGOPTS
     else
 	if [ -n "$NETDUMPADDR" ]; then
+	    if [ ! -f /lib/modules/$KERNEL_VERSION/kernel/drivers/net/netdump.ko ]
+	    then
+	        netdump_failure "This kernel version does not support netdump"
+	    fi
 	    action $"initializing netdump" modprobe netdump \
 		$NETDUMPOPTS
 	fi


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/FC-5/netdump.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- netdump.spec	11 Feb 2006 04:44:04 -0000	1.22
+++ netdump.spec	29 Nov 2006 15:28:23 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
 Version: 0.7.14
-Release: 1.2.1
+Release: 1.2.2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRequires: glib-devel
 Requires: /usr/bin/ssh-keygen /usr/bin/ssh fileutils textutils gawk /sbin/ifconfig
 
+Patch0: netdump-disable-netdump.patch
+
 %package server
 Summary: Server for network kernel crash dumps
 Group: System Environment/Daemons
@@ -26,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -95,6 +98,9 @@
 %doc example_scripts
 
 %changelog
+* Wed Nov 29 2006 Neil Horman <nhorman at redhat.com> 0.7.14-1.2.2
+- Fixing netdump to still allow netconsole access on new kernels (bz197272)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.14-1.2.1
 - bump again for double-long bug on ppc(64)