haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Atomically apply new hostname.if(5) 

This fixes an issue when the interface being configured is the
interface through which ssh traffic is forwarded.

In a complex scenario, one needs to disable the default interface for
NAT, and use other interface for ssh. In this case, when vagrant run
`ifconfig #{ifname} inet delete`, the second ifconfig that is supposed
to restore interface settings will never be called. This might be a rare
need, but it is also strongly recommended to use `netstart` when
reconfiguring interfaces after updating `hostname.if(5)`.

The issue can be triggered when ssh connection has issues between two
`ifconfig` commands.
This commit is contained in:
Tomoyuki Sakurai 2017-12-13 18:34:17 +09:00
parent c0f7023e8e
commit 35d3be865f
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/guests/openbsd/cap/configure_networks.rb
View File

@ -36,15 +36,8 @@ module VagrantPlugins
machine.communicate.sudo("mv /tmp/vagrant-network-entry /etc/hostname.#{ifname}") machine.communicate.sudo("mv /tmp/vagrant-network-entry /etc/hostname.#{ifname}")
# remove old configurations # apply new configurations
machine.communicate.sudo("sudo ifconfig #{ifname} inet delete", { error_check: false }) machine.communicate.sudo("sh /etc/netstart #{ifname}")
machine.communicate.sudo("pkill -f 'dhclient: #{ifname}'", { error_check: false })
if network[:type].to_sym == :static
machine.communicate.sudo("ifconfig #{ifname} inet #{network[:ip]} netmask #{network[:netmask]}")
elsif network[:type].to_sym == :dhcp
machine.communicate.sudo("dhclient #{ifname}")
end
end end
end end
end end