summaryrefslogtreecommitdiff
path: root/interface-templates
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-29 15:10:36 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-29 15:10:36 -0700
commit707e2a247d81af8f53d48ceb1fce750edb99b5f2 (patch)
tree3dd465c8e720174b1cf0c5487d0ced532f4f301b /interface-templates
parentd40f4b9170d8919132fa9f6cf2abed887e0453ac (diff)
parent6321b50e5d41c701506d041d97879d0fdf26e3a8 (diff)
downloadvyatta-cfg-quagga-707e2a247d81af8f53d48ceb1fce750edb99b5f2.tar.gz
vyatta-cfg-quagga-707e2a247d81af8f53d48ceb1fce750edb99b5f2.zip
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-quagga into jenner
Diffstat (limited to 'interface-templates')
-rw-r--r--interface-templates/ip/rip/authentication/md5/node.tag/password/node.def2
-rw-r--r--interface-templates/ip/rip/authentication/plaintext-password/node.def12
-rw-r--r--interface-templates/ip/rip/split-horizon/disable/node.def8
3 files changed, 15 insertions, 7 deletions
diff --git a/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
index 723bd94a..15e09b12 100644
--- a/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
@@ -13,7 +13,7 @@ delete:vyatta-vtysh --noerror \
-c "configure terminal" -c "interface $IFNAME" \
-c "no ip rip authentication mode md5" \
-c "no ip rip authentication key-chain $IFNAME-rip" \
- -c "no key chain $IFNAME-rip" "
+ -c "no key chain $IFNAME-rip"
comp_help: possible completions:
<text> MD5 Key (16 characters or less)
diff --git a/interface-templates/ip/rip/authentication/plaintext-password/node.def b/interface-templates/ip/rip/authentication/plaintext-password/node.def
index 595ae910..b223e61c 100644
--- a/interface-templates/ip/rip/authentication/plaintext-password/node.def
+++ b/interface-templates/ip/rip/authentication/plaintext-password/node.def
@@ -3,11 +3,15 @@ help: Set plain text password
syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$" ; "Password must be 16 characters or less"
commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
- -c "ip rip authentication mode text" -c "ip rip authentication string $VAR(@)";
+update: vyatta-vtysh \
+ -c "configure terminal" -c "interface $IFNAME" \
+ -c "ip rip authentication mode text" \
+ -c "ip rip authentication string $VAR(@)"
-delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
- -c "no ip rip authentication mode" -c "no ip rip authentication string $VAR(@)";
+delete: vyatta-vtysh \
+ -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip rip authentication mode" \
+ -c "no ip rip authentication string $VAR(@)"
comp_help: possible completions:
<text> Password (16 characters or less)
diff --git a/interface-templates/ip/rip/split-horizon/disable/node.def b/interface-templates/ip/rip/split-horizon/disable/node.def
index 10c57ba4..55e8a0d1 100644
--- a/interface-templates/ip/rip/split-horizon/disable/node.def
+++ b/interface-templates/ip/rip/split-horizon/disable/node.def
@@ -1,6 +1,10 @@
help: Disable split horizon on specified interface
-create:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip rip split-horizon "
-delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip rip split-horizon " "
+create:vyatta-vtysh \
+ -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip rip split-horizon"
+delete:vyatta-vtysh \
+ -c "configure terminal" -c "interface $IFNAME" \
+ -c "ip rip split-horizon"
commit:expression: ($VAR(../poison-reverse/) == ""); \
"You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for $IFNAME"