vagrant-unbundled 2.2.10.0 → 2.2.14.0

data/plugins/commands/login/plugin.rb

@@ -2,9 +2,6 @@ require "vagrant"
 
 module VagrantPlugins
   module LoginCommand
-    autoload :Client, File.expand_path("../client", __FILE__)
-    autoload :Errors, File.expand_path("../errors", __FILE__)
-
     class Plugin < Vagrant.plugin("2")
       name "vagrant-login"
       description <<-DESC
@@ -13,18 +10,8 @@ module VagrantPlugins
 
       command(:login) do
         require File.expand_path("../../cloud/auth/login", __FILE__)
-        init!
         VagrantPlugins::CloudCommand::AuthCommand::Command::Login
       end
-
-      protected
-
-      def self.init!
-        return if defined?(@_init)
-        I18n.load_path << File.expand_path("../../cloud/locales/en.yml", __FILE__)
-        I18n.reload!
-        @_init = true
-      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module VagrantPlugins
           if !comm.test("test -f /usr/bin/mount.cifs")
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               pacman -Sy --noconfirm
-              pacman -S --noconfirm cifs-utils
+              pacman -S --noconfirm smbclient cifs-utils
             EOH
           end
         end

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

@@ -0,0 +1,40 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class DarwinVersion
+        
+        VERSION_REGEX = /\d+.\d+.?\d*/.freeze
+
+        # Get the darwin version
+        #
+        # @param [Machine]
+        # @return [String] version of drawin
+        def self.darwin_version(machine)
+          output = ""
+          machine.communicate.sudo("sysctl kern.osrelease") do |_, data|
+            output = data
+          end
+          output.scan(VERSION_REGEX).first
+        end
+
+        # Get the darwin major version
+        #
+        # @param [Machine]
+        # @return [int] major version of drawin (nil if version is not detected)
+        def self.darwin_major_version(machine)
+          output = ""
+          machine.communicate.sudo("sysctl kern.osrelease") do |_, data|
+            output = data
+          end
+          version_string = output.scan(VERSION_REGEX).first
+          if version_string
+            major_version = version_string.split(".").first.to_i
+          else
+            major_version = nil
+          end
+          major_version
+        end
+      end
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ module VagrantPlugins
           mount_options = options[:mount_options];
           mount_command = "mount -t smbfs " +
             (mount_options ? "-o '#{mount_options.join(",")}' " : "") +
-            "'//#{options[:smb_username]}:#{smb_password}@#{options[:smb_host]}/#{name}' " +
+            "//#{options[:smb_username]}:#{smb_password}@#{options[:smb_host]}/#{name} " +
             "#{expanded_guest_path}"
           retryable(on: Vagrant::Errors::DarwinMountFailed, tries: 10, sleep: 2) do
             machine.communicate.execute(

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

@@ -4,6 +4,9 @@ module VagrantPlugins
   module GuestDarwin
     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
@@ -81,9 +84,16 @@ module VagrantPlugins
                   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]
+                  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
                     # Re-bootstrap the root container to pick up firmlink updates
-                    comm.sudo("/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B")
+                    comm.sudo("/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util #{apfs_bootstrap_flag}", good_exit: [expected_rc])
                   end
                 end
               end

data/plugins/guests/darwin/plugin.rb

@@ -31,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,5 +1,6 @@
 require "log4r"
 require 'vagrant/util/guest_hosts'
+require 'vagrant/util/guest_inspection'
 require_relative "../../linux/cap/network_interfaces"
 
 module VagrantPlugins
@@ -15,6 +16,13 @@ module VagrantPlugins
           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
@@ -58,13 +66,6 @@ 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

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

@@ -9,44 +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, 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"
-          end
-          mnt_opts << "credentials=/etc/smb_creds_#{name}"
-          mnt_opts << "uid=#{mount_uid}"
-          mnt_opts << "gid=#{mount_gid}"
-          if !ENV['VAGRANT_DISABLE_SMBMFSYMLINKS']
-            mnt_opts << "mfsymlinks"
-          end
-
-          mnt_opts = merge_mount_options(mnt_opts, options[:mount_options] || [])
-
-          mount_options = "-o #{mnt_opts.join(",")}"
+        
           if mount_options.include?("mfsymlinks")
             display_mfsymlinks_warning(machine.env)
           end
           
-          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}")
@@ -82,27 +70,14 @@ 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("=")
-          end
-        end
-
         def self.display_mfsymlinks_warning(env)
           d_file = env.data_dir.join("mfsymlinks_warning")
           if !d_file.exist?

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

@@ -6,6 +6,12 @@ module VagrantPlugins
       class MountVirtualBoxSharedFolder
         extend SyncedFolder::UnixMountHelpers
 
+        # Mounts and virtualbox 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_virtualbox_shared_folder(machine, name, guestpath, options)
           guest_path = Shellwords.escape(guestpath)
           mount_type = options[:plugin].capability(:mount_type)

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

@@ -8,6 +8,8 @@ module VagrantPlugins
       class PersistMountSharedFolder
         extend SyncedFolder::UnixMountHelpers
 
+        @@logger = Log4r::Logger.new("vagrant::guest::linux::persist_mount_shared_folders")
+
         # 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
@@ -16,6 +18,7 @@ module VagrantPlugins
         # @param [Map<String, Map>] A map of folders to add to fstab
         def self.persist_mount_shared_folder(machine, folders)
           if folders.nil?
+            @@logger.info("clearing /etc/fstab")
             self.remove_vagrant_managed_fstab(machine)
             return
           end
@@ -23,14 +26,16 @@ module VagrantPlugins
           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)
+                guest_path = Shellwords.escape(data[:guestpath])
+                data[:owner] ||= ssh_info[:username]
+                data[:group] ||= ssh_info[:username]
                 mount_type = data[:plugin].capability(:mount_type)
                 mount_options, _, _ = data[:plugin].capability(
                   :mount_options, name, guest_path, data)
+                if data[:plugin].capability?(:mount_name)
+                  name = data[:plugin].capability(:mount_name, data)
+                end
               else
                 next
               end
@@ -53,8 +58,16 @@ module VagrantPlugins
 
         private
 
+        def self.fstab_exists?(machine)
+          machine.communicate.test("test -f /etc/fstab")
+        end
+
         def self.remove_vagrant_managed_fstab(machine)
-          machine.communicate.sudo("sed -i '/\#VAGRANT-BEGIN/,/\#VAGRANT-END/d' /etc/fstab")
+          if fstab_exists?(machine)
+            machine.communicate.sudo("sed -i '/\#VAGRANT-BEGIN/,/\#VAGRANT-END/d' /etc/fstab")
+          else
+            @@logger.info("no fstab file found, carrying on")
+          end
         end
       end
     end

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

@@ -6,7 +6,9 @@ module VagrantPlugins
     module Cap
       class Reboot
         extend Vagrant::Util::GuestInspection::Linux
-        MAX_REBOOT_RETRY_DURATION = 120
+
+        DEFAULT_MAX_REBOOT_RETRY_DURATION = 120
+        WAIT_SLEEP_TIME = 5
 
         def self.reboot(machine)
           @logger = Log4r::Logger.new("vagrant::linux::reboot")
@@ -25,14 +27,17 @@ module VagrantPlugins
 
           @logger.debug("Waiting for machine to finish rebooting")
 
-          wait_remaining = MAX_REBOOT_RETRY_DURATION
+          wait_remaining = ENV.fetch("VAGRANT_MAX_REBOOT_RETRY_DURATION",
+            DEFAULT_MAX_REBOOT_RETRY_DURATION).to_i
+          wait_remaining = DEFAULT_MAX_REBOOT_RETRY_DURATION if wait_remaining < 1
+
           begin
             wait_for_reboot(machine)
-          rescue Vagrant::Errors::MachineGuestNotReady => e
+          rescue Vagrant::Errors::MachineGuestNotReady
             raise if wait_remaining < 0
             @logger.warn("Machine not ready, cannot start reboot yet. Trying again")
-            sleep(5)
-            wait_remaining -= 5
+            sleep(WAIT_SLEEP_TIME)
+            wait_remaining -= WAIT_SLEEP_TIME
             retry
           end
         end

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

@@ -15,9 +15,13 @@ module VagrantPlugins
             basename = name.split('.', 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               # Update sysconfig
-              sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+              if [ -f /etc/sysconfig/network ]; then
+                sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+              fi
               # Update DNS
-              sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{basename}\"/' /etc/sysconfig/network-scripts/ifcfg-*
+              find /etc/sysconfig/network-scripts -maxdepth 1 -type f -name 'ifcfg-*' | xargs -r sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{basename}\"/'
+              # Set the hostname - use hostnamectl if available
+              echo '#{name}' > /etc/hostname
             EOH
 
             if hostnamectl?(comm)

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

@@ -1,22 +1,43 @@
-require_relative '../../linux/cap/change_host_name'
+require 'vagrant/util/guest_hosts'
+require 'vagrant/util/guest_inspection'
 
 module VagrantPlugins
   module GuestSUSE
     module Cap
       class ChangeHostName
-        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-        def self.change_host_name?(comm, name)
-          basename = name.split(".", 2)[0]
-          !comm.test("test \"$(hostnamectl --static status)\" = \"#{basename}\"", sudo: false)
-        end
+        extend Vagrant::Util::GuestInspection::Linux
+        extend Vagrant::Util::GuestHosts::Linux
 
-        def self.change_name_command(name)
+        def self.change_host_name(machine, name)
+          comm = machine.communicate
           basename = name.split(".", 2)[0]
-          return <<-EOH.gsub(/^ {14}/, "")
-          hostnamectl set-hostname '#{basename}'
-          echo #{name} > /etc/HOSTNAME
-          EOH
+
+          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 hostnamectl?(comm)
+            if !comm.test("test \"$(hostnamectl --static status)\" = \"#{basename}\"", sudo: false)
+              cmd = <<-EOH.gsub(/^ {14}/, "")
+              hostnamectl set-hostname '#{basename}'
+              echo #{name} > /etc/HOSTNAME
+              EOH
+              comm.sudo(cmd)
+            end
+          else
+            if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
+              cmd = <<-EOH.gsub(/^ {14}/, "")
+              echo #{name} > /etc/HOSTNAME
+              hostname '#{basename}'
+              EOH
+              comm.sudo(cmd)
+            end
+          end
+
         end
       end
     end

data/plugins/guests/windows/cap/reboot.rb

@@ -4,7 +4,8 @@ module VagrantPlugins
   module GuestWindows
     module Cap
       class Reboot
-        MAX_REBOOT_RETRY_DURATION = 120
+        DEFAULT_MAX_REBOOT_RETRY_DURATION = 120
+        WAIT_SLEEP_TIME = 5
 
         def self.reboot(machine)
           @logger = Log4r::Logger.new("vagrant::windows::reboot")
@@ -25,15 +26,18 @@ module VagrantPlugins
 
           @logger.debug("Waiting for machine to finish rebooting")
 
-          wait_remaining = MAX_REBOOT_RETRY_DURATION
+          wait_remaining = ENV.fetch("VAGRANT_MAX_REBOOT_RETRY_DURATION",
+            DEFAULT_MAX_REBOOT_RETRY_DURATION).to_i
+          wait_remaining = DEFAULT_MAX_REBOOT_RETRY_DURATION if wait_remaining < 1
+
           begin
             wait_for_reboot(machine)
           rescue => err
             raise if wait_remaining < 0
             @logger.debug("Exception caught while waiting for reboot: #{err}")
             @logger.warn("Machine not ready, cannot start reboot yet. Trying again")
-            sleep(5)
-            wait_remaining -= 5
+            sleep(WAIT_SLEEP_TIME)
+            wait_remaining -= WAIT_SLEEP_TIME
             retry
           end
         end