From 8b7275209398e7c8e19c7cf45079bd883e86549c Mon Sep 17 00:00:00 2001 From: Seamus Caveney Date: Tue, 26 Jan 2016 17:29:00 -0500 Subject: vyatta-cfg-system: add support for 6rd tunnel interfaces --- templates/interfaces/tunnel/node.def | 3 +++ templates/interfaces/tunnel/node.tag/6rd-prefix/node.def | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 templates/interfaces/tunnel/node.tag/6rd-prefix/node.def diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index 5fbe205e..720bf64f 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -62,6 +62,9 @@ create: 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 + ip tunnel add $VAR(@) remote $VAR(./remote-ip/@) mode sit + ip tunnel 6rd dev $VAR(@) 6rd-prefix $VAR(./6rd-prefix/@) 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(../@)" -- cgit v1.2.3 From b39be03b11c4bc74eb3e01af4443d6e6ed3cf4d8 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 27 Jan 2016 08:24:10 -0500 Subject: Sanitize dependencies, use ISC DHCP client. --- debian/control | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) 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, -- cgit v1.2.3 From a4ec1d5d58c0f791532244ae8320ac74f2cfa609 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 27 Jan 2016 08:24:32 -0500 Subject: 0.20.44+vyos2+current3 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 Wed, 27 Jan 2016 08:24:32 -0500 + vyatta-cfg-system (0.20.44+vyos2+current2) unstable; urgency=medium * Update dependencies -- cgit v1.2.3 From 1415c7fb591cc210a49b46453c4968fc41894b47 Mon Sep 17 00:00:00 2001 From: Seamus Caveney Date: Wed, 27 Jan 2016 08:58:52 -0500 Subject: vyatta-cfg-system: add 6rd-relay-prefix option to support providers using ipv6 networks larger than /32 --- templates/interfaces/tunnel/node.def | 9 ++++++--- templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index 720bf64f..bd2c4255 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -57,14 +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/@) + 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-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(../@)" -- cgit v1.2.3