From cd7b67d5e03a719bd993d7dc5fa90264f06aa30d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 24 Apr 2009 09:56:38 -0700
Subject: Add support for virtual-ethernets

---
 lib/Vyatta/Interface.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Vyatta/Interface.pm b/lib/Vyatta/Interface.pm
index 50122b4..b2a0041 100755
--- a/lib/Vyatta/Interface.pm
+++ b/lib/Vyatta/Interface.pm
@@ -51,6 +51,10 @@ use constant {
     IFF_ECHO		=> 0x40000,	# echo sent packets
 };
 
+#
+# Mapping from name to attributes
+#   path: configuration level below interfaces
+#   vif:  places to look for vif (if any)
 my %net_prefix = (
     'adsl[\d]+'  => { path => 'adsl',
 		      vif => 'vif',    },
@@ -70,6 +74,7 @@ my %net_prefix = (
     },
     'tun[\d]+' => { path => 'tunnel' },
     'wlm[\d]+' => { path => 'wireless-modem' },
+    'veth[\d]+' => {  path => 'ethernet',    vif => 'vif', },
 );
 
 # get list of interface types
-- 
cgit v1.2.3


From 7da75ac2b740b45d96ae8b2607fffe5cb222c6a9 Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Sun, 26 Apr 2009 19:01:58 -0700
Subject: Add more firewall priorities.

---
 templates/priority | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/priority b/templates/priority
index c6e929d..64d2658 100644
--- a/templates/priority
+++ b/templates/priority
@@ -86,11 +86,11 @@
 # 
 
 200 firewall/group
-210 firewall/name
-210 firewall/modify
-210 firewall/ipv6-name
-210 firewall/ipv6-modify
-210 firewall
+210 firewall/name/node.tag
+210 firewall/modify/node.tag
+210 firewall/ipv6-name/node.tag
+210 firewall/ipv6-modify/node.tag
+215 firewall
 300 protocols/ospf
 301 protocols/ospfv3
 302 protocols/rip
-- 
cgit v1.2.3


From 5d74ce656b33817550903d3471870a303cb70e6b Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Sun, 26 Apr 2009 19:02:45 -0700
Subject: 0.14.68

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ee2b201..bb493b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+vyatta-cfg (0.14.68) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Add support for virtual-ethernets
+
+  [ Stig Thormodsrud ]
+  * Add more firewall priorities.
+
+ -- Stig Thormodsrud <stig@vyatta.com>  Sun, 26 Apr 2009 19:02:45 -0700
+
 vyatta-cfg (0.14.67) unstable; urgency=low
 
   [ Stephen Hemminger ]
-- 
cgit v1.2.3