summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-07 15:38:40 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-07 15:38:40 -0700
commit06acbf6c67ae127378c14b646de3f66efca57a1c (patch)
tree6e3a912ef2a96504c6bbc7ece90f26a3011ed7dd /templates
parentf6b09f98f44c8a2ac0bec819557b30216bb1a2c5 (diff)
parent5fd236efbb3e8adcd342c671d27db6a0e92deab6 (diff)
downloadvyatta-op-06acbf6c67ae127378c14b646de3f66efca57a1c.tar.gz
vyatta-op-06acbf6c67ae127378c14b646de3f66efca57a1c.zip
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-op into hollywood
Diffstat (limited to 'templates')
-rw-r--r--templates/traceroute/node.tag/node.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def
index 83a3f31..cf60ec4 100644
--- a/templates/traceroute/node.tag/node.def
+++ b/templates/traceroute/node.tag/node.def
@@ -12,7 +12,7 @@ run:
/usr/bin/traceroute $2
echo
else
- if cat /etc/resolv.conf | grep -q nameserver
+ if cat /etc/resolv.conf 2> /dev/null | grep -q nameserver
then
if /usr/bin/host $2 &> /dev/null
then