Attachment 160827 Details for Bug 251172 – patch for this issue

[patch] patch for this issue

diff (text/plain), 1.40 KB, created by Bill Nottingham on 2007-08-07 16:02:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2007-08-07 16:02:07 UTC

Size: 1.40 KB

patch

obsolete

>Index: netconsole
>===================================================================
>RCS file: /usr/local/CVS/initscripts/rc.d/init.d/netconsole,v
>retrieving revision 1.1.2.1
>retrieving revision 1.1.2.2
>diff -u -r1.1.2.1 -r1.1.2.2
>--- netconsole	16 Apr 2007 21:56:54 -0000	1.1.2.1
>+++ netconsole	7 Aug 2007 15:18:31 -0000	1.1.2.2
>@@ -17,10 +17,6 @@
> 
> # Check that networking is up.
> . /etc/sysconfig/network
>-if [ ${NETWORKING} = "no" ]
>-then
>-    exit 0
>-fi
> 
> # Source function library.
> . /etc/rc.d/init.d/functions
>@@ -35,11 +31,6 @@
> 
> kernel=`uname -r | cut -d. -f1-2`
> 
>-[ -f /etc/sysconfig/netconsole ] || exit 0
>-. /etc/sysconfig/netconsole
>-
>-[ -z "$SYSLOGADDR" ] && exit 0
>-
> usage ()
> {
> 	echo $"Usage: $0 {start|stop|status|restart|condrestart}" 1>&2
>@@ -78,11 +69,16 @@
> 
> start ()
> {
>+	[ -f /etc/sysconfig/netconsole ] || exit 0
>+	. /etc/sysconfig/netconsole
>+
> 	SYSLOGOPTS=
> 	# syslogd server, if any
>+	if [ -n "$SYSLOGADDR" ]; then
> 	if ! [[ "$SYSLOGADDR" =~ "^([0-9]{1,3}\.){3}[0-9]{1,3}$" ]]; then
> 		SYSLOGADDR=$(LANG=C host $SYSLOGADDR 2>/dev/null | awk '/has address / { print $NF }')
> 	fi
>+	fi
> 	if [ -z "$SYSLOGADDR" ] ; then
> 		echo $"Server address not specified in /etc/sysconfig/netconsole" 1>&2
> 		exit 1
>@@ -118,8 +114,10 @@
> {
> 	if /sbin/lsmod | grep netconsole >/dev/null 2>&1 ; then
> 		echo $"netconsole module loaded"
>+		RETVAL=0
> 	else
> 		echo $"netconsole module not loaded"
>+		RETVAL=3
> 	fi
> }
>

Actions: View | Diff

Attachments on bug 251172: 160827