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

Move bridge_exists check into a function

Browse source
This commit is contained in:
Michael Stucki 2015-07-06 17:44:28 +02:00
parent bb21906ec4
commit fb661300e7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,6 +164,12 @@ module Vagrant
`ip -4 addr show scope global #{bridge_name}` =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/ `ip -4 addr show scope global #{bridge_name}` =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
end end
def bridge_exists?(bridge_name)
@logger.info "Checking whether bridge #{bridge_name} exists"
brctl_output = `ifconfig -a | grep -q #{bridge_name}`
$?.to_i == 0
end
def bridge_is_in_use?(bridge_name) def bridge_is_in_use?(bridge_name)
# REFACTOR: This method is **VERY** hacky # REFACTOR: This method is **VERY** hacky
@logger.info "Checking if bridge #{bridge_name} is in use" @logger.info "Checking if bridge #{bridge_name} is in use"
@ -172,9 +178,7 @@ module Vagrant
end end
def remove_bridge(bridge_name) def remove_bridge(bridge_name)
@logger.info "Checking whether bridge #{bridge_name} exists" return unless bridge_exists?(bridge_name)
brctl_output = `ifconfig -a | grep -q #{bridge_name}`
return if $?.to_i != 0
@logger.info "Removing bridge #{bridge_name}" @logger.info "Removing bridge #{bridge_name}"
@sudo_wrapper.run('ifconfig', bridge_name, 'down') @sudo_wrapper.run('ifconfig', bridge_name, 'down')