rpms/netdump/devel netdump-initscript.patch, 1.1, 1.2 netdump.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: nhorman

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

Modified Files:
	netdump-initscript.patch netdump.spec 
Log Message:
fixing bz 202847

netdump-initscript.patch:
 netdump.init |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

Index: netdump-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netdump-initscript.patch	2 Oct 2006 18:11:21 -0000	1.1
+++ netdump-initscript.patch	2 Oct 2006 19:12:32 -0000	1.2
@@ -1,6 +1,21 @@
---- netdump-0.7.16/netdump.init.orig	2006-10-02 13:56:04.000000000 -0400
-+++ netdump-0.7.16/netdump.init	2006-10-02 13:57:22.000000000 -0400
-@@ -127,7 +127,7 @@ print_address_info ()
+--- netdump-0.7.16/netdump.init.orig	2005-08-01 09:48:40.000000000 -0400
++++ netdump-0.7.16/netdump.init	2006-10-02 15:10:37.000000000 -0400
+@@ -113,21 +113,13 @@ print_address_info ()
+     # IP address only if client and server are on the same subnet
+     # if not, the needed MAC address is that of the gateway;
+     # either way, this will be the first IP address from traceroute
+-    trc_output="$(traceroute -i $DEV -n -m 1 $host_ip 2> /dev/null)"
+-    if [ $? -eq 0 ]; then
+-	trc_output="$(echo $trc_output | grep '^1 ' | awk '{print $2}')"
+-
+-	for line in $trc_output; do mac_ip=$line; done
+-    else
+-	echo "$prog: cannot traceroute $host_ip on interface $DEV" 1>&2
+-	mac_ip=$host_ip
+-    fi
++    mac_ip=$(ip -o route get to $host_ip dev $DEV | awk '{ print $1 }')
+ 
+     # If the server is on the same subnet as the client, but is currently
      # offline, then the first hop will show up as our local address.  This
      # would not be a working setup, so we set mac_ip to the server ip.
      localaddr=$(ip_of_device $DEV)
@@ -9,3 +24,21 @@
  
      arping -c 1 -I $DEV $mac_ip &> /dev/null
      [ $? -ne 0 ] && echo "$prog: cannot arp $mac_ip on $DEV" 1>&2
+@@ -272,7 +264,7 @@ start ()
+     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 +286,7 @@ start ()
+ 	    else
+ 		IPADDR="$NETLOGADDR"
+ 	    fi
+-	    NETLOGOPTS="netlog=@$LOCALDDR/$DEV,$NETLOGPORT@$IPADDR/$NETLOGMACADDR "
++	    NETLOGOPTS="netconsole=@$LOCALDDR/$DEV,$NETLOGPORT@$IPADDR/$NETLOGMACADDR "
+ 	fi
+     fi
+ 


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- netdump.spec	2 Oct 2006 18:11:21 -0000	1.29
+++ netdump.spec	2 Oct 2006 19:12:32 -0000	1.30
@@ -99,6 +99,9 @@
 %doc example_scripts
 
 %changelog
+* Mon Sep 02 2006 Neil Horman <nhorman at redhat.com> - 0.7.16-7
+- Fixing initscript server ip calculation & module options (bz 202847)
+
 * Mon Sep 02 2006 Neil Horman <nhorman at redhat.com> - 0.7.16-6
 - fixing initscript typo (bz 202847)