Skip to content
This repository has been archived by the owner on Nov 24, 2022. It is now read-only.

Getting vagrant-lxc work with system bridge for private network #354

Closed
wants to merge 2 commits into from
Closed

Getting vagrant-lxc work with system bridge for private network #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6140ced
Update driver.rb
podarok Mar 16, 2015
65c7f95
Update gc_private_network_bridges.rb
podarok Mar 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/vagrant-lxc/action/gc_private_network_bridges.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ def remove_bridges_that_are_not_in_use(env)

if ! driver.bridge_is_in_use?(bridge)
env[:ui].info I18n.t("vagrant_lxc.messages.remove_bridge", name: bridge)
# TODO: Output that bridge is being removed
driver.remove_bridge(bridge)
if bridge_name != "lxcbr0"
driver.remove_bridge(bridge)
end
end
end
end
Expand Down
5 changes: 5 additions & 0 deletions lib/vagrant-lxc/driver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@ def bridge_is_in_use?(bridge_name)
end

def remove_bridge(bridge_name)
if bridge_name == "lxcbr0"
@logger.info "Skipping removal system bridge #{bridge_name}"
return
end

@logger.info "Checking whether bridge #{bridge_name} exists"
brctl_output = `ifconfig -a | grep -q #{bridge_name}`
return if $?.to_i != 0
Expand Down