5a4f345363
This fixes a fairly large tempfile leak. Vagrant uses a template renderer to write network configuration files locally to disk. Then, that temporarily file is uploaded to the remote host and moved into place. Since Vagrant is such a short-lived process, GC never came along and cleaned up those tempfiles, resulting in many temporary files being created through regular Vagrant usage. The Util::Tempfile class uses a block to ensure the temporary file is deleted when the block finishes. This API required small tweaks to the usage, but provides more safety to ensure the files are deleted.
52 lines
1.8 KiB
Ruby
52 lines
1.8 KiB
Ruby
require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
require_relative "../../../../lib/vagrant/util/tempfile"
|
|
|
|
module VagrantPlugins
|
|
module GuestOpenBSD
|
|
module Cap
|
|
class ConfigureNetworks
|
|
include Vagrant::Util
|
|
|
|
def self.configure_networks(machine, networks)
|
|
networks.each do |network|
|
|
entry = TemplateRenderer.render("guests/openbsd/network_#{network[:type]}",
|
|
options: network)
|
|
|
|
Tempfile.create("openbsd-configure-networks") do |f|
|
|
f.write(entry)
|
|
f.fsync
|
|
f.close
|
|
machine.communicate.upload(f.path, "/tmp/vagrant-network-entry")
|
|
end
|
|
|
|
# Determine the interface prefix...
|
|
command = "ifconfig -a | grep -o ^[0-9a-z]*"
|
|
result = ""
|
|
ifname = ""
|
|
machine.communicate.execute(command) do |type, data|
|
|
result << data if type == :stdout
|
|
if result.split(/\n/).any?{|i| i.match(/vio*/)}
|
|
ifname = "vio#{network[:interface]}"
|
|
else
|
|
ifname = "em#{network[:interface]}"
|
|
end
|
|
end
|
|
|
|
machine.communicate.sudo("mv /tmp/vagrant-network-entry /etc/hostname.#{ifname}")
|
|
|
|
# remove old configurations
|
|
machine.communicate.sudo("sudo ifconfig #{ifname} inet delete", { error_check: false })
|
|
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
|