From 71505048f9cc8a6e5378619ae172ad756b56b031 Mon Sep 17 00:00:00 2001
From: Gu1 <gu1@aeroxteam.fr>
Date: Sun, 7 Sep 2014 03:51:28 +0200
Subject: [PATCH 1/2] Fix bridge template for Debian

The template would use the item.port variable when bootproto == dhcp,
but it isn't defined anywhere. The correct variable is item.ports.
---
 templates/bridge_Debian.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/bridge_Debian.j2 b/templates/bridge_Debian.j2
index 5a74afd..ff3acee 100644
--- a/templates/bridge_Debian.j2
+++ b/templates/bridge_Debian.j2
@@ -21,7 +21,7 @@ bridge_stp {{ item.stp }}
 {% if item.bootproto == 'dhcp' %}
 iface {{ item.device }}  inet dhcp
 {% if item.ports is defined %}        
-bridge_ports {{ item.port }}
+bridge_ports {{ item.ports|join(' ') }}
 {% endif %}
 {% if item.stp is defined %}        
 bridge_stp {{ item.stp }}

From d4e2daa971d1322626ca1833475ce0ee56903c5b Mon Sep 17 00:00:00 2001
From: Gu1 <gu1@aeroxteam.fr>
Date: Sun, 7 Sep 2014 03:56:45 +0200
Subject: [PATCH 2/2] Fix bridge on Debian when no ports were given

bridge_ports must be set to "none" when no ports were given, else ifupdown
has no way of knowing that this is a bridge interface at all.
---
 templates/bridge_Debian.j2 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/templates/bridge_Debian.j2 b/templates/bridge_Debian.j2
index ff3acee..70a15c4 100644
--- a/templates/bridge_Debian.j2
+++ b/templates/bridge_Debian.j2
@@ -10,9 +10,7 @@ netmask {{ item.netmask }}
 {% if item.gateway is defined %}
 gateway {{ item.gateway }}
 {% endif %}
-{% if item.ports is defined %}        
-bridge_ports {{ item.ports|join(' ') }}
-{% endif %}
+bridge_ports {{ item.ports|default(['none'])|join(' ') }}
 {% if item.stp is defined %}        
 bridge_stp {{ item.stp }}
 {% endif %}
@@ -20,9 +18,7 @@ bridge_stp {{ item.stp }}
 
 {% if item.bootproto == 'dhcp' %}
 iface {{ item.device }}  inet dhcp
-{% if item.ports is defined %}        
-bridge_ports {{ item.ports|join(' ') }}
-{% endif %}
+bridge_ports {{ item.ports|default(['none'])|join(' ') }}
 {% if item.stp is defined %}        
 bridge_stp {{ item.stp }}
 {% endif %}