vagrant-unbundled 2.2.6.0 → 2.2.9.0

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

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/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"
 
@@ -34,10 +35,17 @@ module VagrantPlugins
           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}"
 
           # Create the guest path if it doesn't exist
@@ -94,6 +102,14 @@ SCRIPT
             [key, value].compact.join("=")
           end
         end
+
+        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
     end
   end

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

@@ -0,0 +1,48 @@
+require 'vagrant/util/guest_inspection'
+require "log4r"
+
+module VagrantPlugins
+  module GuestLinux
+    module Cap
+      class Reboot
+        extend Vagrant::Util::GuestInspection::Linux
+        MAX_REBOOT_RETRY_DURATION = 120
+
+        def self.reboot(machine)
+          @logger = Log4r::Logger.new("vagrant::linux::reboot")
+          if systemd?(machine.communicate)
+            reboot_script = "systemctl reboot"
+          else
+            reboot_script = "reboot"
+          end
+
+          comm = machine.communicate
+
+          @logger.debug("Issuing reboot command for guest")
+          comm.sudo(reboot_script)
+
+          machine.ui.info(I18n.t("vagrant.guests.capabilities.rebooting"))
+
+          @logger.debug("Waiting for machine to finish rebooting")
+
+          wait_remaining = MAX_REBOOT_RETRY_DURATION
+          begin
+            wait_for_reboot(machine)
+          rescue Vagrant::Errors::MachineGuestNotReady => e
+            raise if wait_remaining < 0
+            @logger.warn("Machine not ready, cannot start reboot yet. Trying again")
+            sleep(5)
+            wait_remaining -= 5
+            retry
+          end
+        end
+
+        def self.wait_for_reboot(machine)
+          while !machine.guest.ready?
+            sleep 10
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/linux/plugin.rb

@@ -82,6 +82,16 @@ module VagrantPlugins
         Cap::ReadIPAddress
       end
 
+      guest_capability(:linux, :wait_for_reboot) do
+        require_relative "cap/reboot"
+        Cap::Reboot
+      end
+
+      guest_capability(:linux, :reboot) do
+        require_relative "cap/reboot"
+        Cap::Reboot
+      end
+
       guest_capability(:linux, :remove_public_key) do
         require_relative "cap/public_key"
         Cap::PublicKey

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

@@ -10,8 +10,10 @@ module VagrantPlugins
           end
 
           # Detect various flavors we care about
-          if output =~ /(CentOS|Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 7/i
+          if output =~ /(Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 7/i
             return :rhel_7
+          elsif output =~ /(Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 8/i
+            return :rhel_8
           else
             return :rhel
           end

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

@@ -5,7 +5,7 @@ module VagrantPlugins
         def self.nfs_client_install(machine)
           machine.communicate.sudo <<-EOH.gsub(/^ {12}/, '')
             if command -v dnf; then
-              if `dnf info -q libnfs-utils > /dev/null 2>&1` ; then 
+              if `dnf info -q libnfs-utils > /dev/null 2>&1` ; then
                 dnf -y install nfs-utils libnfs-utils portmap
               else
                 dnf -y install nfs-utils nfs-utils-lib portmap
@@ -15,7 +15,7 @@ module VagrantPlugins
             fi
 
             if test $(ps -o comm= 1) == 'systemd'; then
-              /bin/systemctl restart rpcbind nfs
+              /bin/systemctl restart rpcbind nfs-server
             else
               /etc/init.d/rpcbind restart
               /etc/init.d/nfs restart

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

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class SMB
+        def self.smb_install(machine)
+          comm = machine.communicate
+          if !comm.test("test -f /sbin/mount.cifs")
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              if command -v dnf; then
+                dnf -y install cifs-utils
+              else
+                yum -y install cifs-utils
+              fi
+            EOH
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/redhat/plugin.rb

@@ -40,6 +40,11 @@ module VagrantPlugins
         require_relative "cap/rsync"
         Cap::RSync
       end
+
+      guest_capability(:redhat, :smb_install) do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end

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

@@ -5,8 +5,8 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("getent hosts '#{name}'", sudo: false)
-            basename = name.split(".", 2)[0]
+          basename = name.split(".", 2)[0]
+          if !comm.test('test "$(hostnamectl --static status)" = "#{basename}"', sudo: false)
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               hostnamectl set-hostname '#{basename}'
 

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

@@ -37,7 +37,7 @@ module VagrantPlugins
 
           # Ensure the user's ssh directory exists
           remote_ssh_dir = "#{home_dir}\\.ssh"
-          comm.execute("dir \"#{remote_ssh_dir}\"\n if errorlevel 1 (mkdir \"#{remote_ssh_dir}\")", shell: "cmd")
+          comm.execute("New-Item -Path '#{remote_ssh_dir}' -ItemType directory -Force", shell: "powershell")
           remote_upload_path = "#{temp_dir}\\vagrant-insert-pubkey-#{Time.now.to_i}"
           remote_authkeys_path = "#{remote_ssh_dir}\\authorized_keys"
 
@@ -55,7 +55,7 @@ module VagrantPlugins
           File.write(keys_file.path, keys.join("\r\n") + "\r\n")
           comm.upload(keys_file.path, remote_upload_path)
           keys_file.delete
-          comm.execute <<-EOC.gsub(/^\s*/, ""), shell: "powershell"
+          comm.execute(<<-EOC.gsub(/^\s*/, ""), shell: "powershell")
             Set-Acl "#{remote_upload_path}" (Get-Acl "#{remote_authkeys_path}")
             Move-Item -Force "#{remote_upload_path}" "#{remote_authkeys_path}"
           EOC
@@ -67,7 +67,7 @@ module VagrantPlugins
         # @return [Hash] {:temp, :home}
         def self.fetch_guest_paths(communicator)
           output = ""
-          communicator.execute("echo %TEMP%\necho %USERPROFILE%", shell: "cmd") do |type, data|
+          communicator.execute("Write-Output $env:TEMP\nWrite-Output $env:USERPROFILE", shell: "powershell") do |type, data|
             if type == :stdout
               output << data
             end

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

@@ -28,8 +28,9 @@ module VagrantPlugins
           wait_remaining = MAX_REBOOT_RETRY_DURATION
           begin
             wait_for_reboot(machine)
-          rescue HTTPClient::ConnectTimeoutError, Vagrant::Errors::MachineGuestNotReady, WinRM::WinRMHTTPTransportError => e
+          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

data/plugins/hosts/darwin/cap/nfs.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module HostDarwin
+    module Cap
+      class NFS
+        def self.nfs_exports_template(environment)
+          "nfs/exports_darwin"
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/darwin/plugin.rb

@@ -55,6 +55,11 @@ module VagrantPlugins
         require_relative "cap/configured_ip_addresses"
         Cap::ConfiguredIPAddresses
       end
+
+      host_capability("darwin", "nfs_exports_template") do
+        require_relative "cap/nfs"
+        Cap::NFS
+      end
     end
   end
 end

data/plugins/hosts/linux/cap/nfs.rb

@@ -67,6 +67,7 @@ module VagrantPlugins
 
           nfs_opts_setup(folders)
           folders = folder_dupe_check(folders)
+          ips = ips.uniq
           output = Vagrant::Util::TemplateRenderer.render('nfs/exports_linux',
                                            uuid: id,
                                            ips: ips,
@@ -77,7 +78,7 @@ module VagrantPlugins
           sleep 0.5
 
           nfs_cleanup("#{Process.uid} #{id}")
-          output = "#{nfs_exports_content}\n#{output}"
+          output = nfs_exports_content + output
           nfs_write_exports(output)
 
           if nfs_running?(nfs_check_command)
@@ -93,7 +94,7 @@ module VagrantPlugins
               "systemctl --no-pager --no-legend --plain list-unit-files --all --type=service " \
                 "| grep #{nfs_service_name_systemd}").exit_code == 0
           else
-            Vagrant::Util::Subprocess.execute("modinfo", "nfsd").exit_code == 0 ||
+            Vagrant::Util::Subprocess.execute(modinfo_path, "nfsd").exit_code == 0 ||
               Vagrant::Util::Subprocess.execute("grep", "nfsd", "/proc/filesystems").exit_code == 0
           end
         end
@@ -261,6 +262,24 @@ module VagrantPlugins
           Vagrant::Util::Subprocess.execute(*Shellwords.split(check_command)).exit_code == 0
         end
 
+        def self.modinfo_path
+          if !defined?(@_modinfo_path)
+            @_modinfo_path = Vagrant::Util::Which.which("modinfo")
+
+            if @_modinfo_path.to_s.empty?
+              path = "/sbin/modinfo"
+              if File.file?(path)
+                @_modinfo_path = path
+              end
+            end
+
+            if @_modinfo_path.to_s.empty?
+              @_modinfo_path = "modinfo"
+            end
+          end
+          @_modinfo_path
+        end
+
         # @private
         # Reset the cached values for capability. This is not considered a public
         # API and should only be used for testing.

data/plugins/kernel_v2/config/disk.rb

@@ -0,0 +1,199 @@
+require "log4r"
+require "securerandom"
+
+require "vagrant/util/numeric"
+
+module VagrantPlugins
+  module Kernel_V2
+    class VagrantConfigDisk < Vagrant.plugin("2", :config)
+      #-------------------------------------------------------------------
+      # Config class for a given Disk
+      #-------------------------------------------------------------------
+
+      DEFAULT_DISK_TYPES = [:disk, :dvd, :floppy].freeze
+
+      # Note: This value is for internal use only
+      #
+      # @return [String]
+      attr_reader :id
+
+      # File name for the given disk. Defaults to a generated name that is:
+      #
+      #  vagrant_<disk_type>_<short_uuid>
+      #
+      # @return [String]
+      attr_accessor :name
+
+      # Type of disk to create. Defaults to `:disk`
+      #
+      # @return [Symbol]
+      attr_accessor :type
+
+      # Type of disk extension to create. Defaults to `vdi`
+      #
+      # @return [String]
+      attr_accessor :disk_ext
+
+      # Size of disk to create
+      #
+      # @return [Integer,String]
+      attr_accessor :size
+
+      # Path to the location of the disk file (Optional)
+      #
+      # @return [String]
+      attr_accessor :file
+
+      # Determines if this disk is the _main_ disk, or an attachment.
+      # Defaults to true.
+      #
+      # @return [Boolean]
+      attr_accessor :primary
+
+      # Provider specific options
+      #
+      # @return [Hash]
+      attr_accessor :provider_config
+
+      def initialize(type)
+        @logger = Log4r::Logger.new("vagrant::config::vm::disk")
+
+        @type = type
+        @provider_config = {}
+
+        @name = UNSET_VALUE
+        @provider_type = UNSET_VALUE
+        @size = UNSET_VALUE
+        @primary = UNSET_VALUE
+        @file = UNSET_VALUE
+        @disk_ext = UNSET_VALUE
+
+        # Internal options
+        @id = SecureRandom.uuid
+      end
+
+      # Helper method for storing provider specific config options
+      #
+      # Expected format is:
+      #
+      # - `provider__diskoption: value`
+      # - `{provider: {diskoption: value, otherdiskoption: value, ...}`
+      #
+      # Duplicates will be overriden
+      #
+      # @param [Hash] options
+      def add_provider_config(**options, &block)
+        current = {}
+        options.each do |k,v|
+          opts = k.to_s.split("__")
+
+          if opts.size == 2
+            current[opts[0].to_sym] = {opts[1].to_sym => v}
+          elsif v.is_a?(Hash)
+            current[k] = v
+          else
+            @logger.warn("Disk option '#{k}' found that does not match expected provider disk config schema.")
+          end
+        end
+
+        current = @provider_config.merge(current) if !@provider_config.empty?
+        @provider_config = current
+      end
+
+      def finalize!
+        # Ensure all config options are set to nil or default value if untouched
+        # by user
+        @type = :disk if @type == UNSET_VALUE
+        @size = nil if @size == UNSET_VALUE
+        @file = nil if @file == UNSET_VALUE
+
+        @disk_ext = "vdi" if @disk_ext == UNSET_VALUE
+
+        if @primary == UNSET_VALUE
+          @primary = false
+        end
+
+        if @name == UNSET_VALUE
+          if @primary
+            @name = "vagrant_primary"
+          else
+            @name = nil
+          end
+        end
+
+        @provider_config = nil if @provider_config == {}
+      end
+
+      # @return [Array] array of strings of error messages from config option validation
+      def validate(machine)
+        errors = _detected_errors
+
+        # validate type with list of known disk types
+
+        if !DEFAULT_DISK_TYPES.include?(@type)
+          errors << I18n.t("vagrant.config.disk.invalid_type", type: @type,
+                           types: DEFAULT_DISK_TYPES.join(', '))
+        end
+
+        if @disk_ext
+          @disk_ext = @disk_ext.downcase
+
+          if machine.provider.capability?(:validate_disk_ext)
+            if !machine.provider.capability(:validate_disk_ext, @disk_ext)
+              if machine.provider.capability?(:get_default_disk_ext)
+                disk_exts = machine.provider.capability(:get_default_disk_ext).join(', ')
+              else
+                disk_exts = "not found"
+              end
+              errors << I18n.t("vagrant.config.disk.invalid_ext", ext: @disk_ext,
+                               name: @name,
+                               exts: disk_exts)
+            end
+          else
+            @logger.warn("No provider capability defined to validate 'disk_ext' type")
+          end
+        end
+
+        if @size && !@size.is_a?(Integer)
+          if @size.is_a?(String)
+            @size = Vagrant::Util::Numeric.string_to_bytes(@size)
+          end
+
+          if !@size
+            errors << I18n.t("vagrant.config.disk.invalid_size", name: @name, machine: machine.name)
+          end
+        end
+
+        if @file
+          if !@file.is_a?(String)
+            errors << I18n.t("vagrant.config.disk.invalid_file_type", file: @file, machine: machine.name)
+          elsif !File.file?(@file)
+            errors << I18n.t("vagrant.config.disk.missing_file", file_path: @file,
+                             name: @name, machine: machine.name)
+          end
+        end
+
+        if @provider_config
+          if !@provider_config.keys.include?(machine.provider_name)
+            machine.env.ui.warn(I18n.t("vagrant.config.disk.missing_provider",
+                                       machine: machine.name,
+                                       provider_name: machine.provider_name))
+          end
+        end
+
+        if !@name
+          errors << I18n.t("vagrant.config.disk.no_name_set", machine: machine.name)
+        end
+
+        errors
+      end
+
+      # The String representation of this Disk.
+      #
+      # @return [String]
+      def to_s
+        "disk config"
+      end
+    end
+  end
+end