vagrant-unbundled 1.8.4.2 → 1.8.5.1

data/plugins/guests/arch/cap/nfs.rb

@@ -0,0 +1,35 @@
+module VagrantPlugins
+  module GuestArch
+    module Cap
+      class NFS
+        def self.nfs_client_installed(machine)
+          machine.communicate.test("pacman -Q nfs-utils")
+        end
+
+        def self.nfs_pre(machine)
+          comm = machine.communicate
+
+          # There is a bug in NFS where the rpcbind functionality is not started
+          # and it's not a dependency of nfs-utils. Read more here:
+          #
+          #   https://bbs.archlinux.org/viewtopic.php?id=193410
+          #
+          comm.sudo <<-EOH.gsub(/^ {12}/, "")
+            set -e
+            systemctl enable rpcbind
+            systemctl start rpcbind
+          EOH
+        end
+
+        def self.nfs_client_install(machine)
+          comm = machine.communicate
+          comm.sudo <<-EOH.gsub(/^ {12}/, "")
+            set -e
+            pacman --noconfirm -Syy
+            pacman --noconfirm -S nfs-utils ntp
+          EOH
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module GuestArch
+    module Cap
+      class RSync
+        def self.rsync_install(machine)
+          comm = machine.communicate
+          comm.sudo <<-EOH.gsub(/^ {12}/, '')
+            set -e
+            pacman -Sy --noconfirm
+            pacman -S --noconfirm rsync
+          EOH
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module GuestArch
+    module Cap
+      class SMB
+        def self.smb_install(machine)
+          comm = machine.communicate
+          if !comm.test("test -f /usr/bin/mount.cifs")
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              pacman -Sy --noconfirm
+              pacman -S --noconfirm cifs-utils
+            EOH
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/arch/plugin.rb

@@ -6,20 +6,45 @@ module VagrantPlugins
       name "Arch guest"
       description "Arch guest support."
 
-      guest("arch", "linux") do
+      guest(:arch, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("arch", "change_host_name") do
+      guest_capability(:arch, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("arch", "configure_networks") do
+      guest_capability(:arch, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
+
+      guest_capability(:arch, :nfs_client_install) do
+        require_relative "cap/nfs"
+        Cap::NFS
+      end
+
+      guest_capability(:arch, :nfs_client_installed) do
+        require_relative "cap/nfs"
+        Cap::NFS
+      end
+
+      guest_capability(:arch, :nfs_pre) do
+        require_relative "cap/nfs"
+        Cap::NFS
+      end
+
+      guest_capability(:arch, :rsync_install) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:arch, :smb_install) do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end

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

@@ -5,19 +5,22 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname | grep -w '#{name}'")
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH
-hostnamectl set-hostname '#{name}'
+            comm.sudo <<-EOH.gsub(/^ {14}/, "")
+              set -e
 
-# Remove comments and blank lines from /etc/hosts
-sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+              # Set hostname
+              hostnamectl set-hostname '#{basename}'
 
-# Prepend ourselves to /etc/hosts
-grep -w '#{name}' /etc/hosts || {
-  sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-}
-EOH
+              # 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
+              }
+            EOH
           end
         end
       end

data/plugins/guests/atomic/plugin.rb

@@ -6,17 +6,17 @@ module VagrantPlugins
       name "Atomic Host guest"
       description "Atomic Host guest support."
 
-      guest("atomic", "fedora") do
+      guest(:atomic, :fedora) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("atomic", "change_host_name") do
+      guest_capability(:atomic, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("atomic", "docker_daemon_running") do
+      guest_capability(:atomic, :docker_daemon_running) do
         require_relative "cap/docker"
         Cap::Docker
       end

data/plugins/guests/{netbsd → bsd}/cap/halt.rb

@@ -1,10 +1,10 @@
 module VagrantPlugins
-  module GuestNetBSD
+  module GuestBSD
     module Cap
       class Halt
         def self.halt(machine)
           begin
-            machine.communicate.sudo("/sbin/shutdown -p -h now")
+            machine.communicate.sudo("/sbin/shutdown -p now", shell: "sh")
           rescue IOError
             # Do nothing, because it probably means the machine shut down
             # and SSH connection was lost.

data/plugins/guests/bsd/cap/nfs.rb

@@ -0,0 +1,49 @@
+require "shellwords"
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module GuestBSD
+    module Cap
+      class NFS
+        extend Vagrant::Util::Retryable
+
+        # Mount the given NFS folder.
+        def self.mount_nfs_folder(machine, ip, folders)
+          comm = machine.communicate
+
+          folders.each do |name, opts|
+            # Mount each folder separately so we can retry.
+            commands = ["set -e"]
+
+            # Shellescape the paths in case they do not have special characters.
+            guest_path = Shellwords.escape(opts[:guestpath])
+            host_path  = Shellwords.escape(opts[:hostpath])
+
+            # Build the list of mount options.
+            mount_opts =  []
+            mount_opts << "nfsv#{opts[:nfs_version]}" if opts[:nfs_version]
+            mount_opts << "mntudp" if opts[:nfs_udp]
+            if opts[:mount_options]
+              mount_opts = mount_opts + opts[:mount_options].dup
+            end
+            mount_opts = mount_opts.join(",")
+
+            # Make the directory on the guest.
+            commands << "mkdir -p #{guest_path}"
+
+            # Perform the mount operation.
+            commands << "/sbin/mount -t nfs -o '#{mount_opts}' #{ip}:#{host_path} #{guest_path}"
+
+            # Run the command, raising a specific error.
+            retryable(on: Vagrant::Errors::NFSMountFailed, tries: 3, sleep: 5) do
+              machine.communicate.sudo(commands.join("\n"),
+                error_class: Vagrant::Errors::NFSMountFailed,
+                shell: "sh",
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/bsd/cap/public_key.rb

@@ -0,0 +1,65 @@
+require "tempfile"
+
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestBSD
+    module Cap
+      class PublicKey
+        def self.insert_public_key(machine, contents)
+          comm = machine.communicate
+          contents = contents.strip << "\n"
+
+          remote_path = "/tmp/vagrant-insert-pubkey-#{Time.now.to_i}"
+          Tempfile.open("vagrant-bsd-insert-public-key") do |f|
+            f.binmode
+            f.write(contents)
+            f.fsync
+            f.close
+            comm.upload(f.path, remote_path)
+          end
+
+          # Use execute (not sudo) because we want to execute this as the SSH
+          # user (which is "vagrant" by default).
+          comm.execute <<-EOH.gsub(/^ {12}/, "")
+            set -e
+
+            mkdir -p ~/.ssh
+            chmod 0700 ~/.ssh
+            cat '#{remote_path}' >> ~/.ssh/authorized_keys
+            chmod 0600 ~/.ssh/authorized_keys
+
+            rm -f '#{remote_path}'
+          EOH
+        end
+
+        def self.remove_public_key(machine, contents)
+          comm = machine.communicate
+          contents = contents.strip << "\n"
+
+          remote_path = "/tmp/vagrant-remove-pubkey-#{Time.now.to_i}"
+          Tempfile.open("vagrant-bsd-remove-public-key") do |f|
+            f.binmode
+            f.write(contents)
+            f.fsync
+            f.close
+            comm.upload(f.path, remote_path)
+          end
+
+          # Use execute (not sudo) because we want to execute this as the SSH
+          # user (which is "vagrant" by default).
+          comm.execute <<-EOH.sub(/^ {12}/, "")
+            set -e
+
+            if test -f ~/.ssh/authorized_keys; then
+              grep -v -x -f '#{remote_path}' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.tmp
+              mv ~/.ssh/authorized_keys.tmp ~/.ssh/authorized_keys
+            fi
+
+            rm -f '#{remote_path}'
+          EOH
+        end
+      end
+    end
+  end
+end

data/plugins/guests/bsd/cap/virtualbox.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module GuestBSD
+    module Cap
+      class VirtualBox
+        # BSD-based guests do not currently support VirtualBox synced folders.
+        # Instead of raising an error about a missing capability, this defines
+        # the capability and then provides a more detailed error message,
+        # linking to sources on the Internet where the problem is
+        # better-described.
+        def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
+          raise Vagrant::Errors::VirtualBoxMountNotSupportedBSD
+        end
+      end
+    end
+  end
+end

data/plugins/guests/bsd/guest.rb

@@ -0,0 +1,9 @@
+module VagrantPlugins
+  module GuestBSD
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("uname -s | grep -i 'Darwin|BSD'")
+      end
+    end
+  end
+end

data/plugins/guests/bsd/plugin.rb

@@ -0,0 +1,40 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestBSD
+    class Plugin < Vagrant.plugin("2")
+      name "BSD-based guest"
+      description "BSD-based guest support."
+
+      guest(:bsd) do
+        require_relative "guest"
+        Guest
+      end
+
+      guest_capability(:bsd, :halt) do
+        require_relative "cap/halt"
+        Cap::Halt
+      end
+
+      guest_capability(:bsd, :insert_public_key) do
+        require_relative "cap/public_key"
+        Cap::PublicKey
+      end
+
+      guest_capability(:bsd, :mount_nfs_folder) do
+        require_relative "cap/nfs"
+        Cap::NFS
+      end
+
+      guest_capability(:bsd, :mount_virtualbox_shared_folder) do
+        require_relative "cap/virtualbox"
+        Cap::VirtualBox
+      end
+
+      guest_capability(:bsd, :remove_public_key) do
+        require_relative "cap/public_key"
+        Cap::PublicKey
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname --fqdn | grep -w '#{name}'")
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
             comm.sudo("hostname '#{basename}'")
 

data/plugins/guests/coreos/plugin.rb

@@ -6,22 +6,22 @@ module VagrantPlugins
       name "CoreOS guest"
       description "CoreOS guest support."
 
-      guest("coreos", "linux") do
+      guest(:coreos, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("coreos", "change_host_name") do
+      guest_capability(:coreos, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("coreos", "configure_networks") do
+      guest_capability(:coreos, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("coreos", "docker_daemon_running") do
+      guest_capability(:coreos, :docker_daemon_running) do
         require_relative "cap/docker"
         Cap::Docker
       end

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

@@ -5,10 +5,13 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname -f | grep -w '#{name}' || hostname -s | grep -w '#{name}'")
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
 
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              set -e
+
+              # Set hostname
               scutil --set ComputerName '#{name}'
               scutil --set HostName '#{name}'
 

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

@@ -35,12 +35,19 @@ module VagrantPlugins
             end
 
             network_type = network[:type].to_sym
-            if network_type == :static
-              command = "networksetup -setmanual \"#{service_name}\" #{network[:ip]} #{network[:netmask]}"
-            elsif network_type == :dhcp
+            case network_type.to_sym
+            when :static
+              command = "networksetup -setmanual \"#{service_name}\" #{network[:ip]} #{network[:netmask]} #{network[:router]}"
+            when :static6
+              command = "networksetup -setv6manual \"#{service_name}\" #{network[:ip]} #{network[:netmask]} #{network[:router]}"
+            when :dhcp
               command = "networksetup -setdhcp \"#{service_name}\""
+            when :dhcp6
+              # This is not actually possible yet in Vagrant, but when we do
+              # enable IPv6 across the board, Darwin will already have support.
+              command = "networksetup -setv6automatic \"#{service_name}\""
             else
-              raise "#{network_type} network type is not supported, try static or dhcp"
+              raise Vagrant::Errors::NetworkTypeNotSupported, type: network_type
             end
 
             machine.communicate.sudo(command)
@@ -65,7 +72,7 @@ module VagrantPlugins
           ints = ::IO.read(tmp_ints)
           ints.split(/\n\n/m).each do |i|
             if i.match(/Hardware/) && i.match(/Ethernet/)
-              # Ethernet, should be 2 lines, 
+              # Ethernet, should be 2 lines,
               # (3) Thunderbolt Ethernet
               # (Hardware Port: Thunderbolt Ethernet, Device: en1)