summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-04-26 10:58:51 -0700
committerrbalocca <rbalocca@vyatta.com>2008-04-26 10:58:51 -0700
commit492a1b10e5921d3814eb9ef9a741899ffb6f0a6c (patch)
tree0928ce2e09b73d7ad799ce78e49089e70787a90d /templates
parent6c647cde4aa18d39c9a9cfb643b5f81bfc5a7c21 (diff)
parentbe583e255cfcc787944ebf9a9a73bda7a8e064f3 (diff)
downloadvyatta-cfg-quagga-492a1b10e5921d3814eb9ef9a741899ffb6f0a6c.tar.gz
vyatta-cfg-quagga-492a1b10e5921d3814eb9ef9a741899ffb6f0a6c.zip
Merge branch 'glendale' into hollywood
Diffstat (limited to 'templates')
-rw-r--r--templates/interfaces/ethernet/node.tag/disable-link-detect/node.def7
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def6
2 files changed, 4 insertions, 9 deletions
diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
index d1482bbc..7cc1de37 100644
--- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
@@ -1,9 +1,6 @@
help: Set to ignore link state changes on this interface
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../@)\" \
- -c \"no link-detect\" \
- && ${vyatta_sbindir}/vyatta-linkstatus.pl --add $VAR(../@) 2>/dev/null"
-
+ -c \"no link-detect\"
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../@)\" \
- -c \"link-detect \" \
- && ${vyatta_sbindir}/vyatta-linkstatus.pl --del $VAR(../@) 2>/dev/null"
+ -c \"link-detect \"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
index 65ced0e2..64a9b06a 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
@@ -1,9 +1,7 @@
help: Set to ignore link state changes on this interface
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../@).$VAR(../@)\" \
- -c \"no link-detect\" \
- && ${vyatta_sbindir}/vyatta-linkstatus.pl --add $VAR(../../@).$VAR(../@) 2>/dev/null"
+ -c \"no link-detect\"
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../@).$VAR(../@)\" \
- -c \"link-detect \" \
- && ${vyatta_sbindir}/vyatta-linkstatus.pl --del $VAR(../../@).$VAR(../@) 2>/dev/null"
+ -c \"link-detect\"