]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
addons: bridge: fix syntax check failing on bridge without port
authorJulien Fortin <julien@cumulusnetworks.com>
Wed, 11 Jan 2017 20:01:11 +0000 (23:01 +0300)
committerJulien Fortin <julien@cumulusnetworks.com>
Wed, 11 Jan 2017 20:01:11 +0000 (23:01 +0300)
Ticket: CM-13653
Reviewed By: Roopa, Daniel W
Testing Done:

$ cat /etc/network/interfaces
auto bridge
iface bridge
    bridge-vids 10-15
    bridge-vlan-aware yes

$ ifup --syntax-check --verbose --all --interfaces /etc/network/interfaces
info: loading builtin modules from /usr/share/ifupdown2/addons
info: executing /var/lib/ifupdown2/hooks/get_reserved_vlan_range.sh
info: executing /bin/pidof -x clagd
info: executing /var/lib/ifupdown2/hooks/get_reserved_vlan_range.sh
info: executing /bin/pidof mstpd
info: executing /sbin/ip rule show
info: executing /sbin/ip -6 rule show
info: address: using default mtu 1500
info: 'link_master_slave' is set. slave admin state changes will be delayed till the masters admin state change.
info: processing interfaces file /etc/network/interfaces
$ echo $?
0
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
addons/bridge.py

index 3c5b985378c736f1ac6d27a4609e24fb6bd494e8..97ceb4be200069393179bc300b89ae4a71575d12 100644 (file)
@@ -293,7 +293,7 @@ class bridge(moduleBase):
         if ifaceobj.link_privflags & ifaceLinkPrivFlags.BRIDGE_VLAN_AWARE:
             ports = self._get_bridge_port_list(ifaceobj)
             if not ports:
-                return False
+                return True
             result = True
             for port_name in ports:
                 port_obj_l = ifaceobj_getfunc(port_name)