Author: glen Date: Tue May 11 16:19:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- shorter code branches, formatting
---- Files affected:
packages/netconsole:
netconsole.init (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/netconsole/netconsole.init
diff -u packages/netconsole/netconsole.init:1.7
packages/netconsole/netconsole.init:1.8
--- packages/netconsole/netconsole.init:1.7 Mon Aug 24 16:37:48 2009
+++ packages/netconsole/netconsole.init Tue May 11 18:19:26 2010
@@ -20,7 +20,7 @@
# Check that networking is up.
if is_yes "${NETWORKING}"; then
if [ ! -f /var/lock/subsys/network ]; then
- msg_network_down netconsole
+ msg_network_down "netconsole"
exit 1
fi
else
@@ -67,60 +67,63 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/netconsole ]; then
- checkconfig || exit 1
+ if [ -f /var/lock/subsys/netconsole ]; then
+ msg_already_running "netconsole"
+ return
+ fi
- if [ -z "${TGT_MAC}" ]; then
- LC_ALL=C /bin/ping -nq -c 3 "${TGT_IP}" -I "${DEVICE}"
1>/dev/null 2>/dev/null
- ret=$?
- # ping worked, try arp
- if [ $ret -eq 0 ]; then
- TGT_MAC="$(LC_ALL=C arp -an -i ${DEVICE}
${TGT_IP} | egrep -v 'incomplete|no match' | awk '{print $4}')"
- fi
- elif [ "${TGT_MAC}" == "broadcast" ]; then
- TGT_MAC=''
- fi
+ checkconfig || exit 1
- msg_starting netconsole
- modprobe netconsole
netconsole=${src_po...@${src_ip}/${DEVICE},${tgt_po...@${tgt_ip}/${TGT_MAC}
- RETVAL=$?
- if [ $RETVAL = 0 ]; then
- ok
- dmesg -n ${LOGLEVEL}
- touch /var/lock/subsys/netconsole
- else
- fail
+ if [ -z "${TGT_MAC}" ]; then
+ LC_ALL=C /bin/ping -nq -c 3 "${TGT_IP}" -I "${DEVICE}"
1>/dev/null 2>/dev/null
+ ret=$?
+ # ping worked, try arp
+ if [ $ret -eq 0 ]; then
+ TGT_MAC="$(LC_ALL=C arp -an -i ${DEVICE} ${TGT_IP} |
egrep -v 'incomplete|no match' | awk '{print $4}')"
fi
+ elif [ "${TGT_MAC}" == "broadcast" ]; then
+ TGT_MAC=''
+ fi
+
+ msg_starting "netconsole"
+ modprobe netconsole
netconsole=${src_po...@${src_ip}/${DEVICE},${tgt_po...@${tgt_ip}/${TGT_MAC}
+ RETVAL=$?
+ if [ $RETVAL = 0 ]; then
+ ok
+ dmesg -n ${LOGLEVEL}
+ touch /var/lock/subsys/netconsole
else
- msg_already_running netconsole
+ fail
fi
}
stop() {
if [ -f /var/lock/subsys/netconsole ]; then
- msg_stopping netconsole
- modprobe -r netconsole
- RETVAL=$?
- if [ $RETVAL = 0 ]; then
- rm -f /var/lock/subsys/netconsole
- ok
- else
- fail
- fi
+ msg_not_running "netconsole"
+ return
+ fi
+
+ msg_stopping "netconsole"
+ modprobe -r netconsole
+ RETVAL=$?
+ if [ $RETVAL = 0 ]; then
+ rm -f /var/lock/subsys/netconsole
+ ok
else
- msg_not_running netconsole
+ fail
fi
}
condrestart() {
- if [ -f /var/lock/subsys/netconsole ]; then
- checkconfig || exit 1
- stop
- start
- else
- msg_not_running netconsole
+ if [ ! -f /var/lock/subsys/netconsole ]; then
+ msg_not_running "netconsole"
RETVAL=$1
+ return
fi
+
+ checkconfig || exit 1
+ stop
+ start
}
RETVAL=0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netconsole/netconsole.init?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
