vagrant-unbundled 2.2.9.0 → 2.2.10.0

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

@@ -1,4 +1,5 @@
 require "log4r"
+require 'vagrant/util/guest_hosts'
 require_relative "../../linux/cap/network_interfaces"
 
 module VagrantPlugins
@@ -7,6 +8,7 @@ module VagrantPlugins
       class ChangeHostName
 
         extend Vagrant::Util::GuestInspection::Linux
+        extend Vagrant::Util::GuestHosts::Linux
 
         def self.change_host_name(machine, name)
           @logger = Log4r::Logger.new("vagrant::guest::debian::changehostname")
@@ -18,15 +20,6 @@ module VagrantPlugins
               # Set the hostname
               echo '#{basename}' > /etc/hostname
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                if grep -w '^127\\.0\\.1\\.1' /etc/hosts ; then
-                  sed -i'' 's/^127\\.0\\.1\\.1\\s.*$/127.0.1.1\\t#{name}\\t#{basename}/' /etc/hosts
-                else
-                  sed -i'' '1i 127.0.1.1\\t#{name}\\t#{basename}' /etc/hosts
-                fi
-              }
-
               # Update mailname
               echo '#{name}' > /etc/mailname
 
@@ -65,6 +58,13 @@ module VagrantPlugins
               restart_each_interface(machine, @logger)
             end
           end
+
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
+          end
         end
 
         protected
@@ -83,10 +83,10 @@ module VagrantPlugins
           interfaces = VagrantPlugins::GuestLinux::Cap::NetworkInterfaces.network_interfaces(machine)
           nettools = true
           if systemd?(comm)
-            @logger.debug("Attempting to restart networking with systemctl")
+            logger.debug("Attempting to restart networking with systemctl")
             nettools = false
           else
-            @logger.debug("Attempting to restart networking with ifup/down nettools")
+            logger.debug("Attempting to restart networking with ifup/down nettools")
           end
 
           interfaces.each do |iface|

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

@@ -24,7 +24,9 @@ module VagrantPlugins
             set -e
             SSH_DIR="$(grep -q '^AuthorizedKeysFile\s*\/etc\/ssh\/keys-%u\/authorized_keys$' /etc/ssh/sshd_config && echo -n /etc/ssh/keys-${USER} || echo -n ~/.ssh)"
             mkdir -p "${SSH_DIR}"
-            chmod 0700 "${SSH_DIR}"
+            # NB in ESXi 7.0 we cannot change the /etc/ssh/keys-root directory
+            #    permissions, so ignore any errors.
+            chmod 0700 "${SSH_DIR}" || true
             cat '#{remote_path}' >> "${SSH_DIR}/authorized_keys"
             chmod 0600 "${SSH_DIR}/authorized_keys"
             rm -f '#{remote_path}'

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

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestFreeBSD
     module Cap
       class ChangeHostName
+        extend Vagrant::Util::GuestHosts::BSD
+
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
@@ -11,15 +15,15 @@ module VagrantPlugins
               # Set the hostname
               hostname '#{name}'
               sed -i '' 's/^hostname=.*$/hostname=\"#{name}\"/' /etc/rc.conf
-
-              # Prepend ourselves to /etc/hosts
-              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
             comm.sudo(command, shell: "sh")
           end
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
+          end
         end
       end
     end

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

@@ -1,30 +1,22 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestGentoo
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, "")
-              # Set the hostname
-
-              # Use hostnamectl on systemd
-              if [[ `systemctl` =~ -\.mount ]]; then
-                systemctl set-hostname '#{name}'
-              else
-                hostname '#{basename}'
-                echo "hostname=#{basename}" > /etc/conf.d/hostname
-              fi
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              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
+        def self.change_name_command(name)
+          basename = name.split(".", 2)[0]
+          return <<-EOH.gsub(/^ {14}/, '')
+            # Use hostnamectl on systemd
+            if [[ `systemctl` =~ -\.mount ]]; then
+              systemctl set-hostname '#{name}'
+            else
+              hostname '#{basename}'
+              echo "hostname=#{basename}" > /etc/conf.d/hostname
+            fi
+          EOH
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module GuestHaiku
+    module Cap
+      class RSync
+        def self.rsync_installed(machine)
+          machine.communicate.test("test -f /bin/rsync")
+        end
+
+        def self.rsync_install(machine)
+          machine.communicate.execute("pkgman install -y rsync")
+        end
+
+        def self.rsync_command(machine)
+          "rsync -zz"
+        end
+      end
+    end
+  end
+end

data/plugins/guests/haiku/plugin.rb

@@ -30,6 +30,21 @@ module VagrantPlugins
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
+
+      guest_capability(:haiku, :rsync_install) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:haiku, :rsync_installed) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:haiku, :rsync_command) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
     end
   end
 end

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

@@ -0,0 +1,46 @@
+require 'vagrant/util/guest_hosts'
+
+module VagrantPlugins
+  module GuestLinux
+    module Cap
+      module ChangeHostName
+        module Methods
+          def change_name_command(name)
+            return <<-EOH.gsub(/^ {14}/, '')
+                # Set the hostname
+                echo '#{name}' > /etc/hostname
+                hostname '#{name}'
+              EOH
+          end
+
+          def change_host_name?(comm, name)
+            !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
+          end
+
+          def change_host_name(machine, name)
+            comm = machine.communicate
+            
+            network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+            if network_with_hostname
+              replace_host(comm, name, network_with_hostname[:ip])
+            else
+              add_hostname_to_loopback_interface(comm, name)
+            end
+
+            if change_host_name?(comm, name)
+              comm.sudo(change_name_command(name))
+            end
+          end
+        end
+
+        def self.extended(klass)
+          klass.extend(Vagrant::Util::GuestHosts::Linux)
+          klass.extend(Methods)
+        end
+
+        extend Vagrant::Util::GuestHosts::Linux
+        extend Methods
+      end
+    end
+  end
+end

data/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb

@@ -8,20 +8,14 @@ module VagrantPlugins
 
         def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
           guest_path = Shellwords.escape(guestpath)
+          mount_type = options[:plugin].capability(:mount_type)
 
           @@logger.debug("Mounting #{name} (#{options[:hostpath]} to #{guestpath})")
 
-          builtin_mount_type = "-cit vboxsf"
-          addon_mount_type = "-t vboxsf"
+          builtin_mount_type = "-cit #{mount_type}"
+          addon_mount_type = "-t #{mount_type}"
 
-          mount_options = options.fetch(:mount_options, [])
-          detected_ids = detect_owner_group_ids(machine, guest_path, mount_options, options)
-          mount_uid = detected_ids[:uid]
-          mount_gid = detected_ids[:gid]
-
-          mount_options << "uid=#{mount_uid}"
-          mount_options << "gid=#{mount_gid}"
-          mount_options = mount_options.join(',')
+          mount_options, mount_uid, mount_gid = options[:plugin].capability(:mount_options, name, guest_path, options)
           mount_command = "mount #{addon_mount_type} -o #{mount_options} #{name} #{guest_path}"
 
           # Create the guest path if it doesn't exist
@@ -61,7 +55,6 @@ module VagrantPlugins
           emit_upstart_notification(machine, guest_path)
         end
 
-
         def self.unmount_virtualbox_shared_folder(machine, guestpath, options)
           guest_path = Shellwords.escape(guestpath)
 

data/plugins/guests/linux/cap/persist_mount_shared_folder.rb

@@ -0,0 +1,62 @@
+require "vagrant/util"
+
+require_relative "../../../synced_folders/unix_mount_helpers"
+
+module VagrantPlugins
+  module GuestLinux
+    module Cap
+      class PersistMountSharedFolder
+        extend SyncedFolder::UnixMountHelpers
+
+        # Inserts fstab entry for a set of synced folders. Will fully replace
+        # the currently managed group of Vagrant managed entries. Note, passing
+        # empty list of folders will just remove entries
+        #
+        # @param [Machine] machine The machine to run the action on
+        # @param [Map<String, Map>] A map of folders to add to fstab
+        def self.persist_mount_shared_folder(machine, folders)
+          if folders.nil?
+            self.remove_vagrant_managed_fstab(machine)
+            return
+          end
+
+          ssh_info = machine.ssh_info
+          export_folders = folders.map { |type, folder|
+            folder.map { |name, data|
+              guest_path = Shellwords.escape(data[:guestpath])
+              data[:owner] ||= ssh_info[:username]
+              data[:group] ||= ssh_info[:username]
+
+              if data[:plugin].capability?(:mount_type)
+                mount_type = data[:plugin].capability(:mount_type)
+                mount_options, _, _ = data[:plugin].capability(
+                  :mount_options, name, guest_path, data)
+              else
+                next
+              end
+
+              mount_options = "#{mount_options},nofail"
+              {
+                name: name,
+                mount_point: guest_path,
+                mount_type: mount_type,
+                mount_options: mount_options,
+              }
+            }
+          }.flatten.compact
+
+
+          fstab_entry = Vagrant::Util::TemplateRenderer.render('guests/linux/etc_fstab', folders: export_folders)
+          self.remove_vagrant_managed_fstab(machine)
+          machine.communicate.sudo("echo '#{fstab_entry}' >> /etc/fstab")
+        end
+
+        private
+
+        def self.remove_vagrant_managed_fstab(machine)
+          machine.communicate.sudo("sed -i '/\#VAGRANT-BEGIN/,/\#VAGRANT-END/d' /etc/fstab")
+        end
+      end
+    end
+  end
+end

data/plugins/guests/linux/plugin.rb

@@ -11,6 +11,11 @@ module VagrantPlugins
         Guest
       end
 
+      guest_capability(:linux, :change_host_name) do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
       guest_capability(:linux, :choose_addressable_ip_addr) do
         require_relative "cap/choose_addressable_ip_addr"
         Cap::ChooseAddressableIPAddr
@@ -61,6 +66,11 @@ module VagrantPlugins
         Cap::MountVirtualBoxSharedFolder
       end
 
+      guest_capability(:linux, :persist_mount_shared_folder) do
+        require_relative "cap/persist_mount_shared_folder"
+        Cap::PersistMountSharedFolder
+      end
+
       guest_capability(:linux, :network_interfaces) do
         require_relative "cap/network_interfaces"
         Cap::NetworkInterfaces

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

@@ -1,24 +1,18 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestOmniOS
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              # Set hostname
-              echo '#{name}' > /etc/nodename
-              hostname '#{name}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              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
+        def self.change_name_command(name)
+          basename = name.split(".", 2)[0]
+          return <<-EOH.gsub(/^ {14}/, "")
+          # Set hostname
+          echo '#{name}' > /etc/nodename
+          hostname '#{name}'
+          EOH
         end
       end
     end

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

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestOpenBSD
     module Cap
       class ChangeHostName
+        extend Vagrant::Util::GuestHosts::BSD
+
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
@@ -12,15 +16,15 @@ module VagrantPlugins
               hostname '#{name}'
               sed -i'' 's/^hostname=.*$/hostname=\"#{name}\"/' /etc/rc.conf
               echo '#{name}' > /etc/myname
-
-              # Prepend ourselves to /etc/hosts
-              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
             comm.sudo(command, shell: "sh")
           end
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
+          end
         end
       end
     end

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

@@ -1,23 +1,17 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestPhoton
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              # Set the hostname
-              echo '#{name}' > /etc/hostname
-              hostname '#{name}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # 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
+        def self.change_name_command(name)
+          return <<-EOH.gsub(/^ {14}/, "")
+             # Set the hostname
+            echo '#{name}' > /etc/hostname
+            hostname '#{name}'
+          EOH
         end
       end
     end