Skip to content

Netconsole random fixes #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 4 commits into from
Aug 27, 2024
Merged

Netconsole random fixes #485

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f85a3d
netconsole: remove trailing whitespaces
lnykryn Aug 27, 2024
370b5f4
netconsole: remove unused variables
lnykryn Aug 27, 2024
3e54b73
netconsole: source sysconfig/network only if it exists
lnykryn Aug 27, 2024
b12aa8a
netconsole: var/lock -> run/lock
lnykryn Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions usr/libexec/netconsole
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
#
#
# netconsole This loads the netconsole module with the configured parameters.
#
# chkconfig: - 50 50
Expand All @@ -20,10 +20,8 @@

PATH=/sbin:/usr/sbin:$PATH
RETVAL=0
SERVER_ADDRESS_RESOLUTION=

# Check that networking is up.
. /etc/sysconfig/network
[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network

# Source function library.
. /etc/rc.d/init.d/functions
Expand All @@ -36,8 +34,6 @@ SYSLOGADDR=
SYSLOGPORT=514
SYSLOGMACADDR=

kernel=$(uname -r | cut -d. -f1-2)

usage ()
{
echo $"Usage: $0 {start|stop|status|restart|condrestart}" 1>&2
Expand All @@ -50,7 +46,7 @@ print_address_info ()
local route via target

route=$(LANG=C ip -o route get to $host/32)

[ -z "$DEV" ] && DEV=$(echo $route | sed "s|.* dev \([^ ]*\).*|\1|")
echo "DEV=$DEV"
echo "LOCALADDR=$(echo $route | sed "s|.* src \([^ ]*\).*|\1|")"
Expand All @@ -63,9 +59,9 @@ print_address_info ()
if [ -z "$SYSLOGMACADDR" ]; then
arp=$(LANG=C /sbin/arping -f -c 1 -I $DEV $target 2>/dev/null | awk '/ reply from .*[.*]/ { print gensub(".* reply from .* \\[(.*)\\].*","\\1","G"); exit }')
[ -n "$arp" ] && echo "SYSLOGMACADDR=$arp"
fi
}
fi
}

start ()
{
[ -f /etc/sysconfig/netconsole ] || exit 6
Expand Down Expand Up @@ -101,7 +97,7 @@ start ()
exit 6
fi
eval $(print_address_info $SYSLOGADDR)

if [ -z "$SYSLOGMACADDR" ]; then
echo $"netconsole: can't resolve MAC address of $SYSLOGADDR" 1>&2
exit 1
Expand All @@ -116,7 +112,7 @@ start ()
$SYSLOGOPTS
[ "$?" != "0" ] && RETVAL=1
fi
touch /var/lock/subsys/netconsole
touch /run/lock/subsys/netconsole
}

stop ()
Expand All @@ -126,7 +122,7 @@ stop ()
[ "$?" != "0" ] && RETVAL=1
fi

rm -f /var/lock/subsys/netconsole
rm -f /run/lock/subsys/netconsole
}

status ()
Expand All @@ -140,7 +136,6 @@ status ()
fi
}


restart ()
{
stop
Expand All @@ -149,10 +144,9 @@ restart ()

condrestart ()
{
[ -e /var/lock/subsys/netconsole ] && restart
[ -e /run/lock/subsys/netconsole ] && restart
}


case "$1" in
stop) stop ;;
status) status ;;
Expand Down