summaryrefslogtreecommitdiff
path: root/templates/interfaces/ethernet
diff options
context:
space:
mode:
Diffstat (limited to 'templates/interfaces/ethernet')
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def2
4 files changed, 6 insertions, 2 deletions
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
index 55024b2b..bb9c7449 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
@@ -9,4 +9,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
-c \"interface $VAR(../../../../@) \" \
-c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled. You may specify either one of the two options for split-horizon. (disable|poison-reverse)"
+commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)"
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 1eadef9e..7c761112 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -10,5 +10,5 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
-c \"no ip rip split-horizon \" \
-c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled. You may specify either one of the two options for split-horizon. (disable|poison-reverse)"
+commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)"
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 6e37ccc7..7b821eae 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -9,3 +9,5 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
-c \"interface pppoe$VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" \
-c \"ip rip split-horizon \" "
+commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
+
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 4d67c213..adffdae7 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -8,3 +8,5 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "
+commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet Virtual InterFace $VAR(../../../../@)"
+