vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/guests/coreos/guest.rb

@@ -1,3 +1,5 @@
+require "vagrant"
+
 module VagrantPlugins
   module GuestCoreOS
     class Guest < Vagrant.plugin("2", :guest)

data/plugins/guests/coreos/plugin.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       description "CoreOS guest support."
 
       guest("coreos", "linux") do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 

data/plugins/guests/darwin/cap/change_host_name.rb

@@ -3,13 +3,31 @@ module VagrantPlugins
     module Cap
       class ChangeHostName
         def self.change_host_name(machine, name)
-          if !machine.communicate.test("hostname -f | grep '^#{name}$' || hostname -s | grep '^#{name}$'")
-            machine.communicate.sudo("scutil --set ComputerName #{name}")
-            machine.communicate.sudo("scutil --set HostName #{name}")
-            # LocalHostName shouldn't contain dots.
-            # It is used by Bonjour and visible through file sharing services.
-            machine.communicate.sudo("scutil --set LocalHostName #{name.gsub(/\.+/, '')}")
-            machine.communicate.sudo("hostname #{name}")
+          comm = machine.communicate
+
+          if !comm.test("hostname -f | grep -w '#{name}' || hostname -s | grep -w '#{name}'")
+            basename = name.split(".", 2)[0]
+
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              scutil --set ComputerName '#{name}'
+              scutil --set HostName '#{name}'
+
+              # LocalHostName should not contain dots - it is used by Bonjour and
+              # visible through file sharing services.
+              scutil --set LocalHostName '#{basename}'
+
+              hostname '#{name}'
+
+              # Remove comments and blank lines from /etc/hosts
+              sed -i'' -e 's/#.*$//' /etc/hosts
+              sed -i'' -e '/^$/d' /etc/hosts
+
+              # Prepend ourselves to /etc/hosts - sed on bsd is sad
+              grep -w '#{name}' /etc/hosts || {
+                echo -e '127.0.0.1\\t#{name}\\t#{basename}' | cat - /etc/hosts > /tmp/tmp-hosts
+                mv /tmp/tmp-hosts /etc/hosts
+              }
+            EOH
           end
         end
       end

data/plugins/guests/darwin/cap/choose_addressable_ip_addr.rb

@@ -3,16 +3,16 @@ module VagrantPlugins
     module Cap
       module ChooseAddressableIPAddr
         def self.choose_addressable_ip_addr(machine, possible)
-          machine.communicate.tap do |comm|
-            possible.each do |ip|
-              command = "ping -c1 -t1 #{ip}"
-              if comm.test(command)
-                return ip
-              end
+          comm = machine.communicate
+
+          possible.each do |ip|
+            if comm.test("ping -c1 -t1 #{ip}")
+              return ip
             end
           end
 
-          nil
+          # If we got this far, there are no addressable IPs
+          return nil
         end
       end
     end

data/plugins/guests/darwin/cap/insert_public_key.rb

@@ -1,19 +1,31 @@
-require "vagrant/util/shell_quote"
+require "tempfile"
 
 module VagrantPlugins
   module GuestDarwin
     module Cap
       class InsertPublicKey
         def self.insert_public_key(machine, contents)
+          comm = machine.communicate
           contents = contents.chomp
-          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
 
-          machine.communicate.tap do |comm|
-            comm.execute("mkdir -p ~/.ssh")
-            comm.execute("chmod 0700 ~/.ssh")
-            comm.execute("printf '#{contents}\\n' >> ~/.ssh/authorized_keys")
-            comm.execute("chmod 0600 ~/.ssh/authorized_keys")
+          remote_path = "/tmp/vagrant-authorized-keys-#{Time.now.to_i}"
+          Tempfile.open("vagrant-darwin-insert-public-key") do |f|
+            f.binmode
+            f.write(contents)
+            f.fsync
+            f.close
+            comm.upload(f.path, remote_path)
           end
+
+          comm.execute <<-EOH.gsub(/^ {12}/, '')
+            mkdir -p ~/.ssh
+            chmod 0700 ~/.ssh
+            cat '#{remote_path}' >> ~/.ssh/authorized_keys
+            chmod 0600 ~/.ssh/authorized_keys
+
+            # Remove the temporary file
+            rm -f '#{remote_path}'
+          EOH
         end
       end
     end

data/plugins/guests/darwin/guest.rb

@@ -1,4 +1,4 @@
-require 'vagrant/util/template_renderer'
+require "vagrant"
 
 module VagrantPlugins
   module GuestDarwin

data/plugins/guests/darwin/plugin.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       description "Darwin guest support."
 
       guest("darwin")  do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 

data/plugins/guests/debian/cap/change_host_name.rb

@@ -2,92 +2,45 @@ module VagrantPlugins
   module GuestDebian
     module Cap
       class ChangeHostName
+        # For more information, please see:
+        #
+        #   https://wiki.debian.org/HowTo/ChangeHostname
+        #
         def self.change_host_name(machine, name)
-          new(machine, name).change!
-        end
-
-        attr_reader :machine, :new_hostname
-
-        def initialize(machine, new_hostname)
-          @machine = machine
-          @new_hostname = new_hostname
-        end
-
-        def change!
-          return unless should_change?
-
-          update_etc_hostname
-          update_etc_hosts
-          refresh_hostname_service
-          update_mailname
-          renew_dhcp
-        end
-
-        def should_change?
-          new_hostname != current_hostname
-        end
-
-        def current_hostname
-          @current_hostname ||= get_current_hostname
-        end
-
-        def get_current_hostname
-          hostname = ""
-          sudo "hostname -f" do |type, data|
-            hostname = data.chomp if type == :stdout && hostname.empty?
+          comm = machine.communicate
+
+          if !comm.test("hostname -f | grep -w '#{name}'")
+            basename = name.split(".", 2)[0]
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              # Set the hostname
+              echo '#{name}' > /etc/hostname
+              hostname -F /etc/hostname
+
+              # Remove comments and blank lines from /etc/hosts
+              sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+
+              # Prepend ourselves to /etc/hosts
+              grep -w '#{name}' /etc/hosts || {
+                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
+              }
+
+              # Update mailname
+              echo '#{name}' > /etc/mailname
+
+              # Restart networking and force new DHCP
+              if [ test -f /etc/init.d/hostname.sh ]; then
+                invoke-rc.d hostname.sh start
+              fi
+
+              if [ test -f /etc/init.d/networking ]; then
+                invoke-rc.d networking force-reload
+              fi
+
+              if [ test -f /etc/init.d/network-manager ]; then
+                invoke-rc.d network-manager force-reload
+              fi
+            EOH
           end
-
-          hostname
-        end
-
-        def update_etc_hostname
-          sudo("echo '#{short_hostname}' > /etc/hostname")
-        end
-
-        # /etc/hosts should resemble:
-        # 127.0.0.1   localhost
-        # 127.0.1.1   host.fqdn.com host.fqdn host
-        def update_etc_hosts
-          if test("grep '#{current_hostname}' /etc/hosts")
-            # Current hostname entry is in /etc/hosts
-            ip_address = '([0-9]{1,3}\.){3}[0-9]{1,3}'
-            search     = "^(#{ip_address})\\s+#{Regexp.escape(current_hostname)}(\\s.*)?$"
-            replace    = "\\1 #{fqdn} #{short_hostname}"
-            expression = ['s', search, replace, 'g'].join('@')
-
-            sudo("sed -ri '#{expression}' /etc/hosts")
-          else
-            # Current hostname entry isn't in /etc/hosts, just append it
-            sudo("echo '127.0.1.1 #{fqdn} #{short_hostname}' >>/etc/hosts")
-          end
-        end
-
-        def refresh_hostname_service
-          sudo("hostname -F /etc/hostname")
-        end
-
-        def update_mailname
-          sudo("hostname --fqdn > /etc/mailname")
-        end
-
-        def renew_dhcp
-          sudo("ifdown -a; ifup -a; ifup eth0")
-        end
-
-        def fqdn
-          new_hostname
-        end
-
-        def short_hostname
-          new_hostname.split('.').first
-        end
-
-        def sudo(cmd, &block)
-          machine.communicate.sudo(cmd, &block)
-        end
-
-        def test(cmd)
-          machine.communicate.test(cmd)
         end
       end
     end

data/plugins/guests/debian/cap/configure_networks.rb

@@ -1,7 +1,6 @@
-require 'set'
-require 'tempfile'
+require "tempfile"
 
-require "vagrant/util/template_renderer"
+require_relative "../../../../lib/vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestDebian
@@ -10,50 +9,66 @@ module VagrantPlugins
         include Vagrant::Util
 
         def self.configure_networks(machine, networks)
-          machine.communicate.tap do |comm|
-            # First, remove any previous network modifications
-            # from the interface file.
-            comm.sudo("sed -e '/^#VAGRANT-BEGIN/,$ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces.pre")
-            comm.sudo("sed -ne '/^#VAGRANT-END/,$ p' /etc/network/interfaces | tac | sed -e '/^#VAGRANT-END/,$ d' | tac > /tmp/vagrant-network-interfaces.post")
-
-            # Accumulate the configurations to add to the interfaces file as
-            # well as what interfaces we're actually configuring since we use that
-            # later.
-            interfaces = Set.new
-            entries = []
-            networks.each do |network|
-              interfaces.add(network[:interface])
-              entry = TemplateRenderer.render("guests/debian/network_#{network[:type]}",
-                                              options: network)
-
-              entries << entry
-            end
-
-            # Perform the careful dance necessary to reconfigure
-            # the network interfaces
-            temp = Tempfile.new("vagrant")
-            temp.binmode
-            temp.write(entries.join("\n"))
-            temp.close
-
-            comm.upload(temp.path, "/tmp/vagrant-network-entry")
-
-            # Bring down all the interfaces we're reconfiguring. By bringing down
-            # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
-            # SSH never dies.
-            interfaces.each do |interface|
-              comm.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
-              comm.sudo("/sbin/ip addr flush dev eth#{interface} 2> /dev/null")
-            end
-
-            comm.sudo('cat /tmp/vagrant-network-interfaces.pre /tmp/vagrant-network-entry /tmp/vagrant-network-interfaces.post > /etc/network/interfaces')
-            comm.sudo('rm -f /tmp/vagrant-network-interfaces.pre /tmp/vagrant-network-entry /tmp/vagrant-network-interfaces.post')
-
-            # Bring back up each network interface, reconfigured
-            interfaces.each do |interface|
-              comm.sudo("/sbin/ifup eth#{interface}")
-            end
+          comm = machine.communicate
+
+          commands   = []
+          entries    = []
+          interfaces = []
+
+          comm.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, stdout|
+            interfaces = stdout.split("\n")
+          end
+
+          networks.each do |network|
+            network[:device] = interfaces[network[:interface]]
+
+            entry = TemplateRenderer.render("guests/debian/network_#{network[:type]}",
+              options: network,
+            )
+            entries << entry
+          end
+
+          Tempfile.open("vagrant-debian-configure-networks") do |f|
+            f.binmode
+            f.write(entries.join("\n"))
+            f.fsync
+            f.close
+            comm.upload(f.path, "/tmp/vagrant-network-entry")
           end
+
+          networks.each do |network|
+            # Ubuntu 16.04+ returns an error when downing an interface that
+            # does not exist. The `|| true` preserves the behavior that older
+            # Ubuntu versions exhibit and Vagrant expects (GH-7155)
+            commands << "/sbin/ifdown '#{network[:device]}' || true"
+            commands << "/sbin/ip addr flush dev '#{network[:device]}'"
+          end
+
+          # Reconfigure /etc/network/interfaces.
+          commands << <<-EOH.gsub(/^ {12}/, "")
+            # Remove any previous network modifications from the interfaces file
+            sed -e '/^#VAGRANT-BEGIN/,$ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces.pre
+            sed -ne '/^#VAGRANT-END/,$ p' /etc/network/interfaces | tac | sed -e '/^#VAGRANT-END/,$ d' | tac > /tmp/vagrant-network-interfaces.post
+
+            cat \\
+              /tmp/vagrant-network-interfaces.pre \\
+              /tmp/vagrant-network-entry \\
+              /tmp/vagrant-network-interfaces.post \\
+              > /etc/network/interfaces
+
+            rm -f /tmp/vagrant-network-interfaces.pre
+            rm -f /tmp/vagrant-network-entry
+            rm -f /tmp/vagrant-network-interfaces.post
+          EOH
+
+          # Bring back up each network interface, reconfigured.
+          networks.each do |network|
+            commands << "/sbin/ifup '#{network[:device]}'"
+          end
+
+          # Run all the commands in one session to prevent partial configuration
+          # due to a severed network.
+          comm.sudo(commands.join("\n"))
         end
       end
     end

data/plugins/guests/debian/cap/nfs_client.rb

@@ -3,10 +3,11 @@ module VagrantPlugins
     module Cap
       class NFSClient
         def self.nfs_client_install(machine)
-          machine.communicate.tap do |comm|
-            comm.sudo("apt-get -y update")
-            comm.sudo("apt-get -y install nfs-common portmap")
-          end
+          comm = machine.communicate
+          comm.sudo <<-EOH.gsub(/^ {12}/, '')
+            apt-get -yqq update
+            apt-get -yqq install nfs-common portmap
+          EOH
         end
       end
     end

data/plugins/guests/debian/cap/rsync.rb

@@ -3,9 +3,12 @@ module VagrantPlugins
     module Cap
       class RSync
         def self.rsync_install(machine)
-          machine.communicate.tap do |comm|
-            comm.sudo("apt-get -y update")
-            comm.sudo("apt-get -y install rsync")
+          comm = machine.communicate
+          if !comm.test("command -v rsync")
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              apt-get -yqq update
+              apt-get -yqq install rsync
+            EOH
           end
         end
       end

data/plugins/guests/debian/cap/smb.rb

@@ -3,13 +3,12 @@ module VagrantPlugins
     module Cap
       class SMB
         def self.smb_install(machine)
-          # Deb/Ubuntu require mount.cifs which doesn't come by default.
-          machine.communicate.tap do |comm|
-            if !comm.test("test -f /sbin/mount.cifs")
-              machine.ui.detail(I18n.t("vagrant.guest_deb_installing_smb"))
-              comm.sudo("apt-get -y update")
-              comm.sudo("apt-get -y install cifs-utils")
-            end
+          comm = machine.communicate
+          if !comm.test("test -f /sbin/mount.cifs")
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              apt-get -yqq update
+              apt-get -yqq install cifs-utils
+            EOH
           end
         end
       end

data/plugins/guests/debian/guest.rb

@@ -1,3 +1,5 @@
+require "vagrant"
+
 module VagrantPlugins
   module GuestDebian
     class Guest < Vagrant.plugin("2", :guest)