From 4872ac2b9f0736d282877f45eaf0c075b4f0d587 Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Wed, 21 Nov 2007 12:52:45 -0800
Subject: allow <hostname|address> and fix path if vyatta-system not installed

---
 templates/telnet/node.tag/node.def | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/telnet/node.tag/node.def b/templates/telnet/node.tag/node.def
index 258d014..3e0bf32 100644
--- a/templates/telnet/node.tag/node.def
+++ b/templates/telnet/node.tag/node.def
@@ -1,3 +1,6 @@
-help: telnet to <host>
-allowed: sed 's/#.*//; s/^[^ \t]*[ \t]//; /^$/d' ${HOSTFILE:-/dev/null}
-run: shift; ${vyatta_sbindir}/telnet $*
+help: telnet to <hostname|address>
+allowed: echo -n HOSTNAME A.B.C.D X:X::X:X ;
+    sed 's/#.*//; s/^[^ \t]*[ \t]//; /^$/d' ${HOSTFILE:-/dev/null}
+run: test -x ${vyatta_sbindir}/telnet &&
+     ${vyatta_sbindir}/telnet $2 $3 ||
+     /usr/bin/telnet $2 $3
-- 
cgit v1.2.3