Skip to content

Commit

Permalink
Merge pull request #2628 from makern/ifdown-fix
Browse files Browse the repository at this point in the history
guests/redhat: Don't error if ifdown fails [GH-2614]
  • Loading branch information
mitchellh committed Dec 11, 2013
2 parents 8c2e314 + c8a09b3 commit 70b662e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions plugins/guests/redhat/cap/configure_networks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ def self.configure_networks(machine, networks)
networks.each do |network|
interfaces.add(network[:interface])

# Down the interface before munging the config file
retryable(:on => Vagrant::Errors::VagrantError, :tries => 3, :sleep => 2) do
machine.communicate.sudo("/sbin/ifdown eth#{network[:interface]} 2> /dev/null")
end
# Down the interface before munging the config file. This might fail
# if the interface is not actually set up yet so ignore errors.
machine.communicate.sudo(
"/sbin/ifdown eth#{network[:interface]} 2> /dev/null", error_check: false)

# Remove any previous vagrant configuration in this network interface's
# configuration files.
Expand Down Expand Up @@ -52,7 +52,7 @@ def self.configure_networks(machine, networks)
interfaces.each do |interface|
retryable(:on => Vagrant::Errors::VagrantError, :tries => 3, :sleep => 2) do
# The interface should already be down so this probably
# won't do anything, so we run it with error_check false.j
# won't do anything, so we run it with error_check false.
machine.communicate.sudo(
"/sbin/ifdown eth#{interface} 2> /dev/null", error_check: false)

Expand Down

0 comments on commit 70b662e

Please sign in to comment.