From 2d1d83a990dd335fe5f06a7b42020ce4faed5011 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 21 May 2008 15:01:12 -0700
Subject: Fix templates for disable-link-detect when using vif on serial

The vif templates were incorrect. The name was wrong and multilink was
arranged incorrectly.
---
 .../node.tag/vif/node.tag/disable-link-detect/node.def         |  8 ++++++++
 .../multilink/vif/node.tag/disable-link-detect/node.def        |  6 ------
 .../cisco-hdlc/vif/node.tag/disable-link-detect/node.def       | 10 ++++++----
 .../frame-relay/vif/node.tag/disable-link-detect/node.def      | 10 ++++++----
 .../node.tag/ppp/vif/node.tag/disable-link-detect/node.def     | 10 ++++++----
 5 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def
 delete mode 100644 templates/interfaces/multilink/vif/node.tag/disable-link-detect/node.def

(limited to 'templates')

diff --git a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def
new file mode 100644
index 00000000..2bc34032
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def
@@ -0,0 +1,8 @@
+help: ignore link state changes on this interface
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../@).$VAR(../@)" \
+					  -c "no link-detect" 
+delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../@).$VAR(../@)" \
+					  -c "link-detect" 
+
diff --git a/templates/interfaces/multilink/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/multilink/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index e85cadd9..00000000
--- a/templates/interfaces/multilink/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: ignore link state changes on this interface
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "no link-detect" 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "link-detect" 
-
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
index e85cadd9..6bb69330 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
@@ -1,6 +1,8 @@
 help: ignore link state changes on this interface
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "no link-detect" 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "link-detect" 
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../../@).$VAR(../@)" \
+					  -c "no link-detect" 
+delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../../@).$VAR(../@)" \
+					  -c "link-detect" 
 
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
index e85cadd9..6bb69330 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
@@ -1,6 +1,8 @@
 help: ignore link state changes on this interface
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "no link-detect" 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "link-detect" 
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../../@).$VAR(../@)" \
+					  -c "no link-detect" 
+delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../../@).$VAR(../@)" \
+					  -c "link-detect" 
 
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
index e85cadd9..6bb69330 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
@@ -1,6 +1,8 @@
 help: ignore link state changes on this interface
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "no link-detect" 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../../@).$VAR(../@)" \
-          -c "link-detect" 
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../../@).$VAR(../@)" \
+					  -c "no link-detect" 
+delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+					  -c "interface $VAR(../../../@).$VAR(../@)" \
+					  -c "link-detect" 
 
-- 
cgit v1.2.3