glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

Do not remove system bridge virbr0

Browse source
This commit is contained in:
Michael Stucki 2015-08-25 14:36:59 +02:00
parent eb503e42fd
commit 40ced9d3d1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/vagrant-lxc/action/gc_private_network_bridges.rb
View file

@ -35,8 +35,8 @@ module Vagrant
if ! driver.bridge_is_in_use?(bridge) if ! driver.bridge_is_in_use?(bridge)
env[:ui].info I18n.t("vagrant_lxc.messages.remove_bridge", name: bridge) env[:ui].info I18n.t("vagrant_lxc.messages.remove_bridge", name: bridge)
if bridge != "lxcbr0" unless ['lxcbr0', 'virbr0'].include? bridge
driver.remove_bridge(bridge) driver.remove_bridge(bridge)
end end
end end
end end

2
lib/vagrant-lxc/driver.rb
View file

@ -172,7 +172,7 @@ module Vagrant
end end
def remove_bridge(bridge_name) def remove_bridge(bridge_name)
if bridge_name == "lxcbr0" if ['lxcbr0', 'virbr0'].include? bridge_name
@logger.info "Skipping removal system bridge #{bridge_name}" @logger.info "Skipping removal system bridge #{bridge_name}"
return return
end end