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

Merge pull request #383 from stucki/use-system-bridge

Browse source 
Use system bridge
This commit is contained in:
Franz Pletz 2015-08-25 15:20:11 +02:00
parent bbff802b5d 366a98a052
commit 78ef85aa97
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,8 +35,9 @@ 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)
# TODO: Output that bridge is being removed unless ['lxcbr0', 'virbr0'].include? bridge
driver.remove_bridge(bridge) driver.remove_bridge(bridge)
end
end end
end end
end end

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

@ -170,6 +170,11 @@ module Vagrant
end end
def remove_bridge(bridge_name) def remove_bridge(bridge_name)
if ['lxcbr0', 'virbr0'].include? bridge_name
@logger.info "Skipping removal of system bridge #{bridge_name}"
return
end
@logger.info "Checking whether bridge #{bridge_name} exists" @logger.info "Checking whether bridge #{bridge_name} exists"
brctl_output = `ifconfig -a | grep -q #{bridge_name}` brctl_output = `ifconfig -a | grep -q #{bridge_name}`
return if $?.to_i != 0 return if $?.to_i != 0