vagrant-unbundled 1.8.4.2 → 1.8.5.1

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

@@ -4,7 +4,9 @@ module VagrantPlugins
       class Halt
         def self.halt(machine)
           begin
-            machine.communicate.sudo("shutdown -h now")
+            # Darwin does not support the `-p` option like the rest of the
+            # BSD-based guests, so it needs its own cap.
+            machine.communicate.sudo("/sbin/shutdown -h now")
           rescue IOError
             # Do nothing because SSH connection closed and it probably
             # means the VM just shut down really fast.

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

@@ -1,3 +1,5 @@
+require "shellwords"
+
 module VagrantPlugins
   module GuestDarwin
     module Cap
@@ -11,9 +13,8 @@ module VagrantPlugins
         end
 
         def self.rsync_pre(machine, opts)
-          machine.communicate.tap do |comm|
-            comm.sudo("mkdir -p '#{opts[:guestpath]}'")
-          end
+          guest_path = Shellwords.escape(opts[:guestpath])
+          machine.communicate.sudo("mkdir -p #{guest_path}")
         end
 
         def self.rsync_post(machine, opts)
@@ -21,8 +22,10 @@ module VagrantPlugins
             return
           end
 
+          guest_path = Shellwords.escape(opts[:guestpath])
+
           machine.communicate.sudo(
-            "find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " +
+            "find #{guest_path} '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " +
             "xargs -0 chown #{opts[:owner]}:#{opts[:group]}")
         end
       end

data/plugins/guests/darwin/plugin.rb

@@ -6,82 +6,67 @@ module VagrantPlugins
       name "Darwin guest"
       description "Darwin guest support."
 
-      guest("darwin")  do
+      guest(:darwin, :bsd)  do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("darwin", "change_host_name") do
+      guest_capability(:darwin, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("darwin", "choose_addressable_ip_addr") do
+      guest_capability(:darwin, :choose_addressable_ip_addr) do
         require_relative "cap/choose_addressable_ip_addr"
         Cap::ChooseAddressableIPAddr
       end
 
-      guest_capability("darwin", "configure_networks") do
+      guest_capability(:darwin, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("darwin", "halt") do
+      guest_capability(:darwin, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("darwin", "insert_public_key") do
-        require_relative "cap/insert_public_key"
-        Cap::InsertPublicKey
-      end
-
-      guest_capability("darwin", "mount_nfs_folder") do
-        require_relative "cap/mount_nfs_folder"
-        Cap::MountNFSFolder
-      end
-
-      guest_capability("darwin", "mount_smb_shared_folder") do
+      guest_capability(:darwin, :mount_smb_shared_folder) do
         require_relative "cap/mount_smb_shared_folder"
         Cap::MountSMBSharedFolder
       end
 
-      guest_capability("darwin", "mount_vmware_shared_folder") do
+      guest_capability(:darwin, :mount_vmware_shared_folder) do
         require_relative "cap/mount_vmware_shared_folder"
         Cap::MountVmwareSharedFolder
       end
 
-      guest_capability("darwin", "remove_public_key") do
-        require_relative "cap/remove_public_key"
-        Cap::RemovePublicKey
-      end
-
-      guest_capability("darwin", "rsync_installed") do
+      guest_capability(:darwin, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "rsync_command") do
+      guest_capability(:darwin, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "rsync_post") do
+      guest_capability(:darwin, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "rsync_pre") do
+      guest_capability(:darwin, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "shell_expand_guest_path") do
+      guest_capability(:darwin, :shell_expand_guest_path) do
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end
 
-      guest_capability("darwin", "verify_vmware_hgfs") do
+      guest_capability(:darwin, :verify_vmware_hgfs) do
         require_relative "cap/verify_vmware_hgfs"
         Cap::VerifyVmwareHgfs
       end

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

@@ -2,20 +2,23 @@ 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)
           comm = machine.communicate
 
-          if !comm.test("hostname -f | grep -w '#{name}'")
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              # Ensure exit on command error
+              set -e
+
               # Set the hostname
-              echo '#{name}' > /etc/hostname
+              echo '#{basename}' > /etc/hostname
               hostname -F /etc/hostname
 
+              if command -v hostnamectl; then
+                hostnamectl set-hostname '#{basename}'
+              fi
+
               # Remove comments and blank lines from /etc/hosts
               sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
 
@@ -27,17 +30,13 @@ module VagrantPlugins
               # 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
+              # Restart hostname services
+              if test -f /etc/init.d/hostname; then
+                /etc/init.d/hostname start || true
               fi
 
-              if [ test -f /etc/init.d/network-manager ]; then
-                invoke-rc.d network-manager force-reload
+              if test -f /etc/init.d/hostname.sh; then
+                /etc/init.d/hostname.sh start || true
               fi
             EOH
           end

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

@@ -11,13 +11,9 @@ module VagrantPlugins
         def self.configure_networks(machine, networks)
           comm = machine.communicate
 
-          commands   = []
+          commands   = ["set -e"]
           entries    = []
-          interfaces = []
-
-          comm.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, stdout|
-            interfaces = stdout.split("\n")
-          end
+          interfaces = machine.guest.capability(:network_interfaces)
 
           networks.each do |network|
             network[:device] = interfaces[network[:interface]]

data/plugins/guests/debian/cap/{nfs_client.rb → nfs.rb}

@@ -1,10 +1,11 @@
 module VagrantPlugins
   module GuestDebian
     module Cap
-      class NFSClient
+      class NFS
         def self.nfs_client_install(machine)
           comm = machine.communicate
           comm.sudo <<-EOH.gsub(/^ {12}/, '')
+            set -e
             apt-get -yqq update
             apt-get -yqq install nfs-common portmap
           EOH

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

@@ -4,12 +4,11 @@ module VagrantPlugins
       class RSync
         def self.rsync_install(machine)
           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
+          comm.sudo <<-EOH.gsub(/^ {14}/, '')
+            set -e
+            apt-get -yqq update
+            apt-get -yqq install rsync
+          EOH
         end
       end
     end

data/plugins/guests/debian/plugin.rb

@@ -6,32 +6,32 @@ module VagrantPlugins
       name "Debian guest"
       description "Debian guest support."
 
-      guest("debian", "linux") do
+      guest(:debian, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("debian", "configure_networks") do
+      guest_capability(:debian, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("debian", "change_host_name") do
+      guest_capability(:debian, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("debian", "nfs_client_install") do
-        require_relative "cap/nfs_client"
-        Cap::NFSClient
+      guest_capability(:debian, :nfs_client_install) do
+        require_relative "cap/nfs"
+        Cap::NFS
       end
 
-      guest_capability("debian", "rsync_install") do
+      guest_capability(:debian, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("debian", "smb_install") do
+      guest_capability(:debian, :smb_install) do
         require_relative "cap/smb"
         Cap::SMB
       end

data/plugins/guests/esxi/cap/mount_nfs_folder.rb

@@ -13,9 +13,9 @@ module VagrantPlugins
                 comm.execute("localcli storage nfs remove -v #{volume}")
               end
               mount_command = "localcli storage nfs add -H #{ip} -s '#{opts[:hostpath]}' -v '#{volume}'"
-              retryable(on: Vagrant::Errors::LinuxNFSMountFailed, tries: 5, sleep: 2) do
+              retryable(on: Vagrant::Errors::NFSMountFailed, tries: 5, sleep: 2) do
                 comm.execute(mount_command,
-                             error_class: Vagrant::Errors::LinuxNFSMountFailed)
+                             error_class: Vagrant::Errors::NFSMountFailed)
               end
 
               # symlink vmfs volume to :guestpath

data/plugins/guests/esxi/plugin.rb

@@ -6,27 +6,27 @@ module VagrantPlugins
       name "ESXi guest."
       description "ESXi guest support."
 
-      guest("esxi")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:esxi)  do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("esxi", "change_host_name") do
+      guest_capability(:esxi, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("esxi", "configure_networks") do
+      guest_capability(:esxi, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("esxi", "mount_nfs_folder") do
+      guest_capability(:esxi, :mount_nfs_folder) do
         require_relative "cap/mount_nfs_folder"
         Cap::MountNFSFolder
       end
 
-      guest_capability("esxi", "halt") do
+      guest_capability(:esxi, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end

data/plugins/guests/fedora/cap/flavor.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
           if version.nil?
             return :fedora
           else
-            return "fedora_#{version}".to_sym
+            return :"fedora_#{version}"
           end
         end
       end

data/plugins/guests/fedora/plugin.rb

@@ -6,27 +6,12 @@ module VagrantPlugins
       name "Fedora guest"
       description "Fedora guest support."
 
-      guest("fedora", "redhat") do
+      guest(:fedora, :redhat) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("fedora", "change_host_name") do
-        require_relative "cap/change_host_name"
-        Cap::ChangeHostName
-      end
-
-      guest_capability("fedora", "configure_networks") do
-        require_relative "cap/configure_networks"
-        Cap::ConfigureNetworks
-      end
-
-      guest_capability("fedora", "network_scripts_dir") do
-        require_relative "cap/network_scripts_dir"
-        Cap::NetworkScriptsDir
-      end
-
-      guest_capability("fedora", "flavor") do
+      guest_capability(:fedora, :flavor) do
         require_relative "cap/flavor"
         Cap::Flavor
       end

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

@@ -3,10 +3,9 @@ module VagrantPlugins
     module Cap
       class ChangeHostName
         def self.change_host_name(machine, name)
-          options = { shell: "sh" }
           comm = machine.communicate
 
-          if !comm.test("hostname -f | grep -w '#{name}' || hostname -s | grep -w '#{name}'", options)
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false, shell: "sh")
             basename = name.split(".", 2)[0]
             command = <<-EOH.gsub(/^ {14}/, '')
               # Set the hostname
@@ -23,7 +22,7 @@ module VagrantPlugins
                 mv /tmp/tmp-hosts /etc/hosts
               }
             EOH
-            comm.sudo(command, options)
+            comm.sudo(command, shell: "sh")
           end
         end
       end

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

@@ -1,3 +1,5 @@
+require "shellwords"
+
 module VagrantPlugins
   module GuestFreeBSD
     module Cap
@@ -15,9 +17,8 @@ module VagrantPlugins
         end
 
         def self.rsync_pre(machine, opts)
-          machine.communicate.tap do |comm|
-            comm.sudo("mkdir -p '#{opts[:guestpath]}'")
-          end
+          guest_path = Shellwords.escape(opts[:guestpath])
+          machine.communicate.sudo("mkdir -p #{guest_path}")
         end
 
         def self.rsync_post(machine, opts)
@@ -25,8 +26,10 @@ module VagrantPlugins
             return
           end
 
+          guest_path = Shellwords.escape(opts[:guestpath])
+
           machine.communicate.sudo(
-            "find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " +
+            "find #{guest_path} '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " +
             "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}")
         end
       end

data/plugins/guests/freebsd/plugin.rb

@@ -6,67 +6,47 @@ module VagrantPlugins
       name "FreeBSD guest"
       description "FreeBSD guest support."
 
-      guest("freebsd")  do
+      guest(:freebsd, :bsd) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("freebsd", "change_host_name") do
+      guest_capability(:freebsd, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("freebsd", "configure_networks") do
+      guest_capability(:freebsd, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("freebsd", "halt") do
-        require_relative "cap/halt"
-        Cap::Halt
-      end
-
-      guest_capability("freebsd", "insert_public_key") do
-        require_relative "cap/insert_public_key"
-        Cap::InsertPublicKey
-      end
-
-      guest_capability("freebsd", "mount_nfs_folder") do
-        require_relative "cap/mount_nfs_folder"
-        Cap::MountNFSFolder
-      end
-
-      guest_capability("freebsd", "remove_public_key") do
-        require_relative "cap/remove_public_key"
-        Cap::RemovePublicKey
-      end
-
-      guest_capability("freebsd", "rsync_install") do
+      guest_capability(:freebsd, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_installed") do
+      guest_capability(:freebsd, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_command") do
+      guest_capability(:freebsd, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_post") do
+      guest_capability(:freebsd, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_pre") do
+      guest_capability(:freebsd, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "shell_expand_guest_path") do
+      guest_capability(:freebsd, :shell_expand_guest_path) do
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end