Merge branch 'current' of github.com:vyos/vyatta-cfg-system into current

5 files changed, 49 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 0e80c4e1..2d7dc77f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+vyatta-cfg-system (0.20.44+vyos2+current3) unstable; urgency=medium
+
+  [ Kim Hagen ]
+  * Update 'is_live_cd_boot' and 'is_union_instal' functions to search on 'overlay' instead of 'overlayfs'
+
+  [ Seamus Caveney ]
+  * vyatta-cfg-system: add support for 6rd tunnel interfaces
+
+  [ Daniil Baturin ]
+  * Sanitize dependencies, use ISC DHCP client.
+
+ -- Daniil Baturin <daniil@baturin.org>  Wed, 27 Jan 2016 08:24:32 -0500
+
 vyatta-cfg-system (0.20.44+vyos2+current2) unstable; urgency=medium
 
   * Update dependencies
diff --git a/debian/control b/debian/control
index 7f2f2133..5edd8be0 100644
--- a/debian/control
+++ b/debian/control
@@ -20,17 +20,17 @@ Depends:  adduser,
  libpam-runtime (>= 1.0.1-5),
  vyatta-bash | bash (>= 3.1),
  sysv-rc,
- ntp (>= 4.2.4p6+vyatta-7),
+ ntp (>= 4.2),
  udev (>= 160-1),
  rsyslog | system-log-daemon,
  busybox,
  sudo,
- snmpd (>= 5.4.2.1-vyatta11),
- vyatta-keepalived (>= 1.1.15-1-vyatta-5),
+ snmpd,
+ keepalived,
  bridge-utils,
  ethtool,
- ssh (>= 1:5.1p1-5),
- openssh-server (>= 1:5.1p1-5),
+ ssh,
+ openssh-server,
  ed,
  ifupdown,
  tshark,
@@ -42,7 +42,7 @@ Depends:  adduser,
  tasksel,
  snmp,
  tcpdump,
- dnsmasq (>= 2.45-1+lenny1),
+ dnsmasq,
  mdadm,
  ddclient (>= 3.8.2+vyos2+current1),
  dnsutils,
@@ -53,9 +53,8 @@ Depends:  adduser,
  apt-transport-https,
  hostapd (>= 1:0.6.9-3),
  libcap2-bin (>= 2.19),
- vyatta-dhcp3-client (>= 4.1.8+vyos2+current1),
- vlan,
- iproute,
+ isc-dhcp-client,
+ iproute2,
  curl,
  parted,
  libsnmp-perl,
diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def
index 5fbe205e..bd2c4255 100644
--- a/templates/interfaces/tunnel/node.def
+++ b/templates/interfaces/tunnel/node.def
@@ -57,11 +57,17 @@ create:
         else
             TTL="ttl 255"
         fi
-	    if [ -n "$VAR(./parameters/ip/key/@)" ]; then
+        if [ -n "$VAR(./parameters/ip/key/@)" ]; then
             KEY="key $VAR(./parameters/ip/key/@)"
-	    fi
+        fi
         if [ "$VAR(./encapsulation/@)" == "gre" ] && [ -z $VAR(./remote-ip/) ]; then
             ip tunnel add $VAR(@) local $LIP mode gre $KEY $TTL $TOS
+        elif [ "$VAR(./encapsulation/@)" == "sit" ] && [ -n "$VAR(./6rd-prefix/@)" ]; then
+            if [ -n "$VAR(./6rd-relay-prefix/@)" ]; then
+                RP="6rd-relay_prefix $VAR(./6rd-relay-prefix/@)"
+            fi
+            ip tunnel add $VAR(@) remote $VAR(./remote-ip/@) mode sit
+            ip tunnel 6rd dev $VAR(@) 6rd-prefix $VAR(./6rd-prefix/@) $RP
         else
             ip tunnel add $VAR(@) local $LIP remote $VAR(./remote-ip/@) mode $VAR(./encapsulation/@) $KEY $TTL $TOS
         fi
diff --git a/templates/interfaces/tunnel/node.tag/6rd-prefix/node.def b/templates/interfaces/tunnel/node.tag/6rd-prefix/node.def
new file mode 100644
index 00000000..7e899d5d
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/6rd-prefix/node.def
@@ -0,0 +1,10 @@
+multi:
+type: ipv6net
+val_help: ipv6net; IPv6 address and prefix length
+help: 6rd network prefix
+
+syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
+
+create:expression: "true"
+update:expression: "false" ; \
+               "6rd-prefix can only be modified at tunnel creation for $VAR(../@)"
diff --git a/templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def b/templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def
new file mode 100644
index 00000000..0f877e2d
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def
@@ -0,0 +1,10 @@
+multi:
+type: ipv4net
+val_help: ipv4net; IPv4 prefix of interface for 6rd
+help: 6rd relay prefix
+
+syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
+
+create:expression: "true"
+update:expression: "false" ; \
+               "6rd-relay-prefix can only be modified at tunnel creation for $VAR(../@)"