vagrant-unbundled 2.2.7.0 → 2.2.16.0

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

@@ -5,6 +5,25 @@ module VagrantPlugins
     module Cap
       class MountVmwareSharedFolder
 
+        MACOS_BIGSUR_DARWIN_VERSION = 20.freeze
+
+        # Entry point for hook to called delayed actions
+        # which finalizing the synced folders setup on
+        # the guest
+        def self.write_apfs_firmlinks(env)
+          if env && env[:machine] && delayed = apfs_firmlinks_delayed.delete(env[:machine].id)
+            delayed.call
+          end
+        end
+
+        # @return [Hash] storage location for delayed actions
+        def self.apfs_firmlinks_delayed
+          if !@_apfs_firmlinks
+            @_apfs_firmlinks = {}
+          end
+          @_apfs_firmlinks
+        end
+
         # we seem to be unable to ask 'mount -t vmhgfs' to mount the roots
         # of specific shares, so instead we symlink from what is already
         # mounted by the guest tools
@@ -61,17 +80,21 @@ module VagrantPlugins
 
               # If we haven't already added our hook to apply firmlinks, do it now
               if @apply_firmlinks[machine.id][:content].empty?
-                Plugin.action_hook(:apfs_firmlinks, :after_synced_folders) do |hook|
-                  action = proc { |*_|
-                    content = @apply_firmlinks[machine.id][:content].join("\n")
-                    # Write out the synthetic file
-                    comm.sudo("echo -e #{content.inspect} > /etc/synthetic.conf")
-                    if @apply_firmlinks[:bootstrap]
-                      # Re-bootstrap the root container to pick up firmlink updates
-                      comm.sudo("/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B")
+                apfs_firmlinks_delayed[machine.id] = proc do
+                  content = @apply_firmlinks[machine.id][:content].join("\n")
+                  # Write out the synthetic file
+                  comm.sudo("echo -e #{content.inspect} > /etc/synthetic.conf")
+                  if @apply_firmlinks[machine.id][:bootstrap]
+                    if machine.guest.capability("darwin_major_version").to_i < MACOS_BIGSUR_DARWIN_VERSION
+                      apfs_bootstrap_flag = "-B"
+                      expected_rc = 0
+                    else
+                      apfs_bootstrap_flag = "-t"
+                      expected_rc = 253
                     end
-                  }
-                  hook.prepend(action)
+                    # Re-bootstrap the root container to pick up firmlink updates
+                    comm.sudo("/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util #{apfs_bootstrap_flag}", good_exit: [expected_rc])
+                  end
                 end
               end
               @apply_firmlinks[machine.id][:content] << share_line

data/plugins/guests/darwin/plugin.rb

@@ -6,6 +6,11 @@ module VagrantPlugins
       name "Darwin guest"
       description "Darwin guest support."
 
+      action_hook(:apfs_firmlinks, :synced_folders) do |hook|
+        require_relative "cap/mount_vmware_shared_folder"
+        hook.prepend(Vagrant::Action::Builtin::Delayed, Cap::MountVmwareSharedFolder.method(:write_apfs_firmlinks))
+      end
+
       guest(:darwin, :bsd)  do
         require_relative "guest"
         Guest
@@ -26,6 +31,16 @@ module VagrantPlugins
         Cap::ConfigureNetworks
       end
 
+      guest_capability(:darwin, :darwin_version) do
+        require_relative "cap/darwin_version"
+        Cap::DarwinVersion
+      end
+
+      guest_capability(:darwin, :darwin_major_version) do
+        require_relative "cap/darwin_version"
+        Cap::DarwinVersion
+      end
+
       guest_capability(:darwin, :halt) do
         require_relative "cap/halt"
         Cap::Halt

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

@@ -1,4 +1,6 @@
 require "log4r"
+require 'vagrant/util/guest_hosts'
+require 'vagrant/util/guest_inspection'
 require_relative "../../linux/cap/network_interfaces"
 
 module VagrantPlugins
@@ -7,26 +9,25 @@ 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")
           comm = machine.communicate
 
           if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
+            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
+
             basename = name.split(".", 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               # 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
 
@@ -83,10 +84,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/debian/cap/configure_networks.rb

@@ -10,7 +10,6 @@ module VagrantPlugins
         extend Vagrant::Util::GuestInspection::Linux
 
         NETPLAN_DEFAULT_VERSION = 2
-        NETPLAN_DEFAULT_RENDERER = "networkd".freeze
         NETPLAN_DIRECTORY = "/etc/netplan".freeze
         NETWORKD_DIRECTORY = "/etc/systemd/network".freeze
 
@@ -61,12 +60,21 @@ module VagrantPlugins
           # By default, netplan expects the renderer to be systemd-networkd,
           # but if any device is managed by NetworkManager, then we use that renderer
           # ref: https://netplan.io/reference
-          renderer = NETPLAN_DEFAULT_RENDERER
-          ethernets.keys.each do |k|
-            if nm_controlled?(comm, k)
-              renderer = "NetworkManager"
-              break
+          if systemd_networkd?(comm)
+            renderer = "networkd"
+            ethernets.keys.each do |k|
+              if nm_controlled?(comm, k)
+                render = "NetworkManager"
+                if !nmcli?(comm)
+                  raise Vagrant::Errors::NetworkManagerNotInstalled, device: k
+                end
+                break
+              end
             end
+          elsif nmcli?(comm)
+            renderer = "NetworkManager"
+          else
+            raise Vagrant::Errors::NetplanNoAvailableRenderers
           end
 
           np_config = {"network" => {"version" => NETPLAN_DEFAULT_VERSION,

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/fedora/guest.rb

@@ -1,11 +1,11 @@
 require "vagrant"
+require_relative '../linux/guest'
 
 module VagrantPlugins
   module GuestFedora
-    class Guest < Vagrant.plugin("2", :guest)
-      def detect?(machine)
-        machine.communicate.test("grep 'Fedora release' /etc/redhat-release")
-      end
+    class Guest < VagrantPlugins::GuestLinux::Guest
+      # Name used for guest detection
+      GUEST_DETECTION_NAME = "fedora".freeze
     end
   end
 end

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/halt.rb

@@ -1,10 +1,18 @@
+require 'vagrant/util/guest_inspection'
+
 module VagrantPlugins
   module GuestLinux
     module Cap
       class Halt
+        extend Vagrant::Util::GuestInspection::Linux
+
         def self.halt(machine)
           begin
-            machine.communicate.sudo("shutdown -h now")
+            if systemd?(machine.communicate)
+              machine.communicate.sudo("systemctl poweroff")
+            else
+              machine.communicate.sudo("shutdown -h now")
+            end
           rescue IOError, Vagrant::Errors::SSHDisconnected
             # Do nothing, because it probably means the machine shut down
             # and SSH connection was lost.

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

@@ -1,3 +1,4 @@
+require "fileutils"
 require "shellwords"
 require_relative "../../../synced_folders/unix_mount_helpers"
 
@@ -8,37 +9,32 @@ module VagrantPlugins
 
         extend SyncedFolder::UnixMountHelpers
 
+        # Mounts and SMB folder on linux guest
+        #
+        # @param [Machine] machine
+        # @param [String] name of mount
+        # @param [String] path of mount on guest
+        # @param [Hash] hash of mount options 
         def self.mount_smb_shared_folder(machine, name, guestpath, options)
           expanded_guest_path = machine.guest.capability(
             :shell_expand_guest_path, guestpath)
+          options[:smb_id] ||= name
 
-          mount_device   = "//#{options[:smb_host]}/#{name}"
-
-          mount_options = options.fetch(:mount_options, [])
-          detected_ids = detect_owner_group_ids(machine, guestpath, mount_options, options)
-          mount_uid = detected_ids[:uid]
-          mount_gid = detected_ids[:gid]
-
+          mount_device = options[:plugin].capability(:mount_name, name, options)
+          mount_options, _, _ = options[:plugin].capability(
+            :mount_options, name, expanded_guest_path, options)
+          mount_type = options[:plugin].capability(:mount_type)
           # If a domain is provided in the username, separate it
           username, domain = (options[:smb_username] || '').split('@', 2)
           smb_password = options[:smb_password]
           # Ensure password is scrubbed
           Vagrant::Util::CredentialScrubber.sensitive(smb_password)
-
-          mnt_opts = []
-          if machine.env.host.capability?(:smb_mount_options)
-            mnt_opts += machine.env.host.capability(:smb_mount_options)
-          else
-            mnt_opts << "sec=ntlmssp"
+        
+          if mount_options.include?("mfsymlinks")
+            display_mfsymlinks_warning(machine.env)
           end
-          mnt_opts << "credentials=/etc/smb_creds_#{name}"
-          mnt_opts << "uid=#{mount_uid}"
-          mnt_opts << "gid=#{mount_gid}"
-
-          mnt_opts = merge_mount_options(mnt_opts, options[:mount_options] || [])
-
-          mount_options = "-o #{mnt_opts.join(",")}"
-          mount_command = "mount -t cifs #{mount_options} #{mount_device} #{expanded_guest_path}"
+          
+          mount_command = "mount -t #{mount_type} -o #{mount_options} #{mount_device} #{expanded_guest_path}"
 
           # Create the guest path if it doesn't exist
           machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
@@ -74,24 +70,19 @@ SCRIPT
           ensure
             # Always remove credentials file after mounting attempts
             # have been completed
-            machine.communicate.sudo("rm /etc/smb_creds_#{name}")
+            if !machine.config.vm.allow_fstab_modification
+              machine.communicate.sudo("rm /etc/smb_creds_#{name}")
+            end
           end
 
           emit_upstart_notification(machine, expanded_guest_path)
         end
 
-        def self.merge_mount_options(base, overrides)
-          base = base.join(",").split(",")
-          overrides = overrides.join(",").split(",")
-          b_kv = Hash[base.map{|item| item.split("=", 2) }]
-          o_kv = Hash[overrides.map{|item| item.split("=", 2) }]
-          merged = {}.tap do |opts|
-            (b_kv.keys + o_kv.keys).uniq.each do |key|
-              opts[key] = o_kv.fetch(key, b_kv[key])
-            end
-          end
-          merged.map do |key, value|
-            [key, value].compact.join("=")
+        def self.display_mfsymlinks_warning(env)
+          d_file = env.data_dir.join("mfsymlinks_warning")
+          if !d_file.exist?
+            FileUtils.touch(d_file.to_path)
+            env.ui.warn(I18n.t("vagrant.actions.vm.smb.mfsymlink_warning"))
           end
         end
       end