From ab857f46cb19f9acdc53afb496ce6a13f3636b2f Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Sat, 30 May 2009 12:54:32 -0700
Subject: Change tunnel multicast from on/off to enable/disable.

---
 templates/interfaces/tunnel/node.def                    |  7 +++++--
 templates/interfaces/tunnel/node.tag/multicast/node.def | 13 +++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def
index 68302461..77aaa5fa 100644
--- a/templates/interfaces/tunnel/node.def
+++ b/templates/interfaces/tunnel/node.def
@@ -16,11 +16,14 @@ create:expression: "\
        if [ -n \"$VAR(./key/@)\" ]; then                        \
           KEY=\"key $VAR(./key/@)\";                            \
        fi;                                                      \
-       MC=\"multicast $VAR(./multicast/@) allmulticast $VAR(./multicast/@)\"; \
+       if [ x$VAR(./multicast/@) == xenable ]; then             \
+          MC=\"multicast on allmulticast on\";                  \
+       fi;                                                      \
        sudo ip tunnel add $VAR(@)                               \
             local $VAR(./local-ip/@) remote $VAR(./remote-ip/@) \
             mode $VAR(./encapsulation/@) $KEY;                  \
-       sudo ip link set $VAR(@) $MC up;" ; "Error creating $VAR(@)"
+       sudo ip link set $VAR(@) $MC up;" ;                      \
+            "Error creating $VAR(@)"
 
 delete:expression: "sudo ip tunnel del $VAR(@)" ; "Error deleting $VAR(@)"
 
diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def
index 2b9762e1..d7662306 100644
--- a/templates/interfaces/tunnel/node.tag/multicast/node.def
+++ b/templates/interfaces/tunnel/node.tag/multicast/node.def
@@ -1,13 +1,14 @@
 type: txt
-help: Define multicast operation over tunnel
-default: "off"
-syntax:expression: $VAR(@) in "on", "off"; "Must be (on, off)"
+help: Set multicast operation over tunnel
+default: "disable"
+
+syntax:expression: $VAR(@) in "enable", "disable"; \
+                   "Must be 'disable' or 'enable'"
 
 create:expression: "true"
 update:expression: "false" ; \
                    "Multicast should be set at tunnel creation for $VAR(../@)"
 
 comp_help: "possible completions:
- on                 Enable Multicast
- off                Disable Multicast (default)
-
+  enable            Enable Multicast
+  disable           Disable Multicast (default)
-- 
cgit v1.2.3