Update vyatta-cjdns-updateconf

Author: neilalexander

vyatta-cjdns/opt/vyatta/sbin/vyatta-cjdns-updateconf

@@ -122,9 +122,9 @@ def updateEthernetBindTo(interface, endpoint):
 def updateEthernetBeacon(interface, beaconmode):
     if beaconmode == "none":
         data['interfaces']['ETHInterface'][int(interface)]['beacon'] = 0
-    if beaconmode == "accept":
+    elif beaconmode == "listen":
         data['interfaces']['ETHInterface'][int(interface)]['beacon'] = 1
-    elif beaconmode == "accept-send":
+    elif beaconmode == "listen-send":
         data['interfaces']['ETHInterface'][int(interface)]['beacon'] = 2
     else:
         data['interfaces']['ETHInterface'][int(interface)]['beacon'] = int(beaconmode)

vyatta-cjdns/opt/vyatta/share/vyatta-cfg/templates/interfaces/cjdns/node.tag/ethernet-interface/node.tag/beacon/node.def

@@ -3,7 +3,7 @@ help: Beacon mode
 val_help: u32; Beacon mode (0 is none, 1 is listen, 2 is listen-send)
 val_help: txt; Beacon mode ("none", "listen" or "listen-send")
 allowed: echo "none listen listen-send"
-default: 0
+default: "none"
 
 create: /opt/vyatta/sbin/vyatta-cjdns-updateconf $VAR(../../@) updateEthernetBeacon $VAR(../@) $VAR(@)
 update: /opt/vyatta/sbin/vyatta-cjdns-updateconf $VAR(../../@) updateEthernetBeacon $VAR(../@) $VAR(@)