X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=blobdiff_plain;f=tools%2Fnetconsole;h=1a0ef22244e3d5dbe0cfd4983ca1666198cd8a81;hp=6ef2723f5848a0b7f973067271d9c5bf1150a18a;hb=221c4d982698d9f537237108f779b8174ce24c87;hpb=9914be9dee28adf70dbfceeb62ec51d23ce096fc

diff --git a/tools/netconsole b/tools/netconsole
index 6ef2723f58..1a0ef22244 100755
--- a/tools/netconsole
+++ b/tools/netconsole
@@ -2,7 +2,7 @@
 
 usage() {
 	(
-	echo "Usage: $0 <board IP> [board port]"
+	echo "Usage: $0 <board-IP> [board-port [board-in-port]]"
 	echo ""
 	echo "If port is not specified, '6666' will be used"
 	[ -z "$*" ] && exit 0
@@ -24,9 +24,13 @@ while [ -n "$1" ] ; do
 done
 
 ip=$1
-port=${2:-6666}
+board_out_port=${2:-6666}
+board_in_port=${3:-${board_out_port}}
 
-if [ -z "${ip}" ] || [ -n "$3" ] ; then
+echo Board out port: ${board_out_port}
+echo Board in port: ${board_in_port}
+
+if [ -z "${ip}" ] || [ -n "$4" ] ; then
 	usage "Invalid number of arguments"
 fi
 
@@ -39,10 +43,21 @@ echo "NOTE: the interrupt signal (normally ^C) has been remapped to ^T"
 
 stty -icanon -echo intr ^T
 (
-while ${nc} -u -l -p ${port} < /dev/null ; do
-	:
-done
+if type ncb 2>/dev/null ; then
+	# see if ncb is in $PATH
+	exec ncb ${board_out_port}
+
+elif [ -x ${0%/*}/ncb ] ; then
+	# maybe it's in the same dir as the netconsole script
+	exec ${0%/*}/ncb ${board_out_port}
+
+else
+	# blah, just use regular netcat
+	while ${nc} -u -l -p ${board_out_port} < /dev/null ; do
+		:
+	done
+fi
 ) &
 pid=$!
-${nc} -u ${ip} ${port}
+${nc} -u ${ip} ${board_in_port}
 kill ${pid} 2>/dev/null