8021q-untagged-bridge.diff

Vladislav Gorbunov, 05/14/2014 09:52 PM

Download (1.07 KB)

View differences:

/var/lib/one/tmp/HostManaged.rb 2014-05-14 19:11:30.097999984 +1200
50 50
                    ifup bridge
51 51
                end
52 52

  
53
                if !device_exists?(dev, vlan)
54
                    create_dev_vlan(dev, vlan)
55
                    ifup(dev, vlan)
56
                end
57

  
58
                if !attached_bridge_dev?(bridge, dev, vlan)
59
                    attach_brigde_dev(bridge, dev, vlan)
53
                if vlan.to_i > 1
54
                    if !device_exists?(dev, vlan)
55
                        create_dev_vlan(dev, vlan)
56
                        ifup(dev, vlan)
57
                    end
58

  
59
                    if !attached_bridge_dev?(bridge, dev, vlan)
60
                        attach_brigde_dev(bridge, dev, vlan)
61
                    end
62
                else
63
                    if !attached_bridge_dev?(bridge, dev)
64
                        attach_brigde_dev(bridge, dev)
65
                    end
60 66
                end
61 67
            end
62 68
        end