vagrant-unbundled 2.2.7.0 → 2.2.16.0

data/plugins/synced_folders/nfs/synced_folder.rb

@@ -30,7 +30,9 @@ module VagrantPlugins
         if !machine.config.nfs.functional
           return false
         end
-        return true if machine.env.host.capability(:nfs_installed)
+        if machine.env.host.capability?(:nfs_installed)
+          return true if machine.env.host.capability(:nfs_installed)
+        end
         return false if !raise_error
         raise Vagrant::Errors::NFSNotSupported
       end

data/plugins/synced_folders/smb/cap/default_fstab_modification.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module SyncedFolderSMB
+    module Cap
+      module DefaultFstabModification
+        def self.default_fstab_modification(machine)
+          return false
+        end
+      end
+    end
+  end
+end

data/plugins/synced_folders/smb/cap/mount_options.rb

@@ -0,0 +1,56 @@
+require_relative "../../unix_mount_helpers"
+
+module VagrantPlugins
+  module SyncedFolderSMB
+    module Cap
+      module MountOptions
+        extend VagrantPlugins::SyncedFolder::UnixMountHelpers
+
+        MOUNT_TYPE = "cifs".freeze
+
+        # Returns mount options for a smb synced folder
+        #
+        # @param [Machine] machine
+        # @param [String] name of mount
+        # @param [String] path of mount on guest
+        # @param [Hash] hash of mount options 
+        def self.mount_options(machine, name, guest_path, options)
+          mount_options = options.fetch(:mount_options, [])
+          options[:smb_id] ||= name
+          detected_ids = detect_owner_group_ids(machine, guest_path, mount_options, options)
+          mount_uid = detected_ids[:uid]
+          mount_gid = detected_ids[:gid]
+
+          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_#{options[:smb_id]}"
+          mnt_opts << "uid=#{mount_uid}"
+          mnt_opts << "gid=#{mount_gid}"
+          if !ENV['VAGRANT_DISABLE_SMBMFSYMLINKS']
+            mnt_opts << "mfsymlinks"
+          end
+          mnt_opts << "_netdev"
+          mnt_opts = merge_mount_options(mnt_opts, options[:mount_options] || [])
+          mnt_opts << "nofail"
+          mount_options = mnt_opts.join(",")
+          return mount_options, mount_uid, mount_gid
+        end
+
+        def self.mount_type(machine)
+          return  MOUNT_TYPE
+        end
+
+        def self.mount_name(machine, name, data)
+          data[:smb_host] ||= machine.guest.capability(
+            :choose_addressable_ip_addr, candidate_ips)
+          "//#{data[:smb_host]}/#{data[:smb_id]}"
+        end
+      end
+    end
+  end
+end

data/plugins/synced_folders/smb/plugin.rb

@@ -23,6 +23,26 @@ module VagrantPlugins
         SyncedFolder
       end
 
+      synced_folder_capability("smb", "default_fstab_modification") do
+        require_relative "cap/default_fstab_modification"
+        Cap::DefaultFstabModification
+      end
+
+      synced_folder_capability("smb", "mount_options") do
+        require_relative "cap/mount_options"
+        Cap::MountOptions
+      end
+
+      synced_folder_capability("smb", "mount_name") do
+        require_relative "cap/mount_options"
+        Cap::MountOptions
+      end
+
+      synced_folder_capability("smb", "mount_type") do
+        require_relative "cap/mount_options"
+        Cap::MountOptions
+      end
+
       protected
 
       def self.init!

data/plugins/synced_folders/smb/synced_folder.rb

@@ -57,7 +57,7 @@ module VagrantPlugins
               smb_username = username if username != ""
               modify_username = true
             else
-              smb_username = machine.ui.ask("Username: ")
+              smb_username = machine.ui.ask("Username (user[@domain]): ")
             end
 
             smb_password = machine.ui.ask("Password (will be hidden): ", echo: false)
@@ -66,7 +66,7 @@ module VagrantPlugins
             if machine.env.host.capability?(:smb_validate_password)
               Vagrant::Util::CredentialScrubber.sensitive(smb_password)
               auth_success = machine.env.host.capability(:smb_validate_password,
-                smb_username, smb_password)
+                machine, smb_username, smb_password)
             end
 
             break if auth_success

data/plugins/synced_folders/unix_mount_helpers.rb

@@ -100,6 +100,20 @@ module VagrantPlugins
           EOH
       end
 
+      def 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
     end
   end
 end

data/scripts/website_push_www.sh

@@ -34,7 +34,7 @@ git add .
 git commit -q -m "Deploy by $USER"
 
 git remote add heroku git@heroku.com:vagrantup-www-2.git
-git push -f heroku master
+git push -f heroku main
 
 # Cleanup the deploy
 rm -rf $DEPLOY

data/templates/commands/init/Vagrantfile.min.erb

@@ -1,3 +1,6 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
 Vagrant.configure("2") do |config|
   config.vm.box = "<%= box_name %>"
   <% if box_version -%>

data/templates/guests/arch/systemd_networkd/network_dhcp.erb

@@ -0,0 +1,6 @@
+[Match]
+Name=<%= options[:device] %>
+
+[Network]
+Description=A basic DHCP ethernet connection
+DHCP=ipv4

data/templates/guests/arch/systemd_networkd/network_static.erb

@@ -0,0 +1,9 @@
+[Match]
+Name=<%= options[:device] %>
+
+[Network]
+Description=A basic static ethernet connection
+Address=<%= options[:ip]%>/<%= options[:netmask] %>
+<% if options[:gateway] -%>
+Gateway=<%= options[:gateway] %>
+<% end -%>

data/templates/guests/arch/systemd_networkd/network_static6.erb

@@ -0,0 +1,9 @@
+[Match]
+Name=<%= options[:device] %>
+
+[Network]
+Description=A basic static ethernet connection
+Address=<%= options[:ip]%>/<%= options[:netmask] %>
+<% if options[:gateway] -%>
+Gateway=<%= options[:gateway] %>
+<% end -%>

data/templates/guests/linux/etc_fstab.erb

@@ -0,0 +1,6 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+<% folders.each do |opts| %>
+<%= opts[:name] %> <%= opts[:mount_point] %> <%= opts[:mount_type] %> <%= opts[:mount_options] || 'default' %> <%= opts[:dump] || 0 %> <%= opts[:fsck] || 0 %>
+<%end%>
+#VAGRANT-END

data/templates/guests/nixos/network.erb

@@ -1,16 +1,15 @@
 { config, pkgs, ... }:
 {
-  networking.interfaces = [
+  networking.interfaces = {
     <% networks.select {|n| n[:device]}.each do |network| %>
-    { 
-      name         = "<%= network[:device] %>";
+    <%= network[:device] %>.ipv4.addresses = [{
       <% if network[:type] == :static %>
-      ipAddress    = "<%= network[:ip] %>";
+      address = "<%= network[:ip] %>";
       <% end %>
       <% if network[:prefix_length] %>
       prefixLength = <%= network[:prefix_length] %>;
       <% end %>
-    }
+    }];
     <% end %>
-  ];
+  };
 }

data/templates/locales/en.yml

@@ -127,6 +127,17 @@ en:
       Warning: Chef run list is empty. This may not be what you want.
     cli_interrupt: |-
       Exiting due to interrupt.
+    cloud_init_waiting: Waiting for cloud init to finish running
+    container_pulling_single: |-
+      -- Image: %{name}
+    container_building_single: |-
+      -- Path: %{path}
+    container_running: |-
+      -- Container: %{name}
+    container_restarting_container_args: |-
+      -- Detected changes to container '%{name}' args, restarting...
+    container_restarting_container_image: |-
+      -- Detected newer image for container '%{name}', restarting...
     docker_auto_start_not_available: |-
       Unable to configure automatic restart of Docker containers on
       the guest machine
@@ -154,6 +165,10 @@ en:
       -- Detected newer image for container '%{name}', restarting...
     docker_starting_containers: |-
       Starting Docker containers...
+    hyperv_enable_enhanced_session: |-
+      Setting VM Enhanced session transport type to HvSocket
+    hyperv_disable_enhanced_session: |-
+      Setting VM Enhanced session transport type to disabled/default (VMBus)
     inserted_key: |-
       Key inserted! Disconnecting and reconnecting using new SSH key...
     inserting_insecure_detected: |-
@@ -301,7 +316,7 @@ en:
         Vagrant has been configured to abort. Vagrant will terminate
         after remaining running actions have completed...
       start: |-
-        Running %{type} triggers %{stage} %{action} ...
+        Running %{type} triggers %{stage} %{name} ...
       fire_with_name: |-
         Running trigger: %{name}...
       fire: |-
@@ -711,6 +726,10 @@ en:
         or transient network issues. The reported error is:
 
         %{message}
+      source_spec_not_found: |-
+        Vagrant failed to properly initialize its internal library
+        dependencies. Please try running the command again. If this
+        error persists, please report a bug.
       cant_read_mac_addresses: |-
         The provider you are using  ('%{provider}') doesn't support the
         "nic_mac_addresses" provider capability which is required
@@ -774,6 +793,11 @@ en:
         Additionally, the created environment must be started with a provider
         matching this provider. For example, if you're using VirtualBox,
         the clone environment must also be using VirtualBox.
+      cloud_init_not_found: |-
+        cloud-init is not found. Please ensure that cloud-init is installed and
+        available on path for guest '%{guest_name}'.
+      cloud_init_command_failed: |-
+        cloud init command '%{cmd}' failed on guest '%{guest_name}'.
       command_deprecated: |-
         The command 'vagrant %{name}' has been deprecated and is no longer functional
         within Vagrant.
@@ -818,6 +842,9 @@ en:
         they'll have to be destroyed manually.
 
         Path: %{path}
+      create_iso_host_cap_not_found: |-
+        Vagrant cannot create an iso due to the host capability for creating isos not existing.
+        Vagrant will now exit.
       destroy_requires_force: |-
         Destroy doesn't have a TTY to ask for confirmation. Please pass the
         `--force` flag to force a destroy, otherwise attach a TTY so that
@@ -925,6 +952,18 @@ en:
         ("%{value}") could not be found. Please verify that the plugin is
         installed which implements this host and that the value you used
         for `config.vagrant.host` is correct.
+      iso_build_failed: |-
+        Failed to build iso image. The following command returned an error:
+
+        %{cmd}
+
+        Stdout from the command:
+
+        %{stdout}
+
+        Stderr from the command:
+
+        %{stderr}
       hyperv_virtualbox_error: |-
         Hyper-V and VirtualBox cannot be used together and will result in a
         system crash. Vagrant will now exit. Please disable Hyper-V if you wish
@@ -996,6 +1035,9 @@ en:
         the proper location.
       multi_vm_target_required: |-
         This command requires a specific VM name to target in a multi-VM environment.
+      netplan_no_available_renderers: |-
+        No renderers compatible with netplan are available on guest. Please install
+        a compatible renderer.
       net_ssh_exception: |-
         An error occurred in the underlying SSH library that Vagrant uses.
         The error message is shown below. In many cases, errors from this
@@ -1113,6 +1155,10 @@ en:
         The license file to install could not be found. Please verify
         the path you gave is correct. The path to the license file given
         was: '%{path}'
+      plugin_install_failed: |-
+        Vagrant was unable to install the requested plugin: '%{name}'
+        Please try to install this plugin again. If Vagrant is still unable
+        to install the requested plugin, please report this error.
       plugin_install_space: |-
         The directory where plugins are installed (the Vagrant home directory)
         has a space in it. On Windows, there is a bug in Ruby when compiling
@@ -1192,6 +1238,23 @@ en:
         following command:
 
           vagrant plugin install --local
+      plugin_needs_developer_tools: |-
+        Vagrant failed to install the requested plugin because development tools
+        are required for installation but are not currently installed on this
+        machine. Please install development tools and then try this command
+        again.
+      plugin_missing_library: |-
+        Vagrant failed to install the requested plugin because it depends
+        on a library which is not currently installed on this system. The
+        following library is required by the '%{name}' plugin:
+
+          %{library}
+
+        Please install the library and then run the command again.
+      plugin_missing_ruby_dev: |-
+        Vagrant failed to install the requested plugin because the Ruby header
+        files could not be found. Install the ruby development package for your
+        system and then run this command again.
       powershell_not_found: |-
         Failed to locate the powershell executable on the available PATH. Please
         ensure powershell is installed and available on the local PATH, then
@@ -1414,6 +1477,11 @@ en:
         usually indicates that SSH within the guest machine was unable to
         properly start up. Please boot the VM in GUI mode to check whether
         it is booting properly.
+      ssh_no_exit_status: |-
+        The SSH command completed, but Vagrant did not receive an exit status.
+        This indicates that the command was terminated unexpectedly. Please
+        check that the VM has sufficient memory to run the command and that no
+        processes were killed by the guest operating system.
       ssh_no_route: |-
         While attempting to connect with SSH, a "no route to host" (EHOSTUNREACH)
         error was received. Please verify your network settings are correct
@@ -1525,7 +1593,8 @@ en:
       triggers_no_stage_given: |-
         The incorrect stage was given to the trigger plugin:
         Guest: %{guest_name}
-        Action: %{action}
+        Name:  %{name}
+        Type:  %{type}
         Stage: %{stage}
 
         This is an internal error that should be reported as a bug.
@@ -1641,6 +1710,30 @@ en:
         4.2.14 contains a critical bug which prevents it from working with
         Vagrant. VirtualBox 4.2.16+ fixes this problem. Please upgrade
         VirtualBox.
+      virtualbox_disks_controller_not_found: |-
+        Vagrant expected to find a storage controller called '%{name}',
+        but there is no controller with this name attached to the current VM.
+        If you have changed or removed any storage controllers, please restore
+        them to their previous configuration.
+      virtualbox_disks_no_supported_controllers: |-
+        Vagrant was unable to detect a disk controller with any of the
+        following supported types:
+
+        %{supported_types}
+
+        Please add one of the supported controller types in order to use the
+        disk configuration feature.
+      virtualbox_disks_defined_exceed_limit: |-
+        VirtualBox only allows up to %{limit} disks to be attached to the
+        storage controller '%{name}'. Please remove some disks from your disk
+        configuration, or attach a new storage controller.
+      virtualbox_disks_primary_not_found: |-
+        Vagrant was not able to detect a primary disk attached to the main
+        controller. Vagrant Disks requires that the primary disk be attached
+        to the first port of the main controller in order to manage it.
+      virtualbox_disks_unsupported_controller: |-
+        An disk operation was attempted on the controller '%{controller_name}',
+        but Vagrant doesn't support this type of disk controller.
       virtualbox_guest_property_not_found: |-
         Could not find a required VirtualBox guest property:
           %{guest_property}
@@ -1802,6 +1895,13 @@ en:
 #-------------------------------------------------------------------------------
     config:
       disk:
+        dvd_type_file_required:
+          A 'file' option is required when defining a disk of type ':dvd' for guest '%{machine}'.
+        dvd_type_primary: |-
+          Disks of type ':dvd' cannot be defined as a primary disks. Please
+          remove the 'primary' argument for disk '%{name}' on guest '%{machine}'.
+        invalid_ext: |-
+          Disk type '%{ext}' is not a valid disk extension for '%{name}'. Please pick one of the following supported disk types: %{exts}
         invalid_type: |-
           Disk type '%{type}' is not a valid type. Please pick one of the following supported disk types: %{types}
         invalid_size: |-
@@ -1812,6 +1912,8 @@ en:
           Disk file '%{file_path}' for disk '%{name}' on machine '%{machine}' does not exist.
         missing_provider: |-
           Guest '%{machine}' using provider '%{provider_name}' has provider specific config options for a provider other than '%{provider_name}'. These provider config options will be ignored for this guest
+        no_name_set: |-
+          A 'name' option is required when defining a disk for guest '%{machine}'.
       common:
         bad_field: "The following settings shouldn't exist: %{fields}"
       chef:
@@ -1853,6 +1955,11 @@ en:
           The key `paranoid` is deprecated. Please use `verify_host_key`. Supported
           values are exactly the same, only the name of the option has changed.
         ssh_config_missing: "`config` file must exist: %{path}"
+        connect_timeout_invalid_type: |-
+          The `connect_timeout` key only accepts values of Integer type. Received
+          `%{given}` type which cannot be converted to an Integer type.
+        connect_timeout_invalid_value: |-
+          The `connect_timeout` key only accepts values greater than 1 (received `%{given}`)
       triggers:
         bad_trigger_type: |-
           The type '%{type}' defined for trigger '%{trigger}' is not valid. Must be one of the following types: '%{types}'
@@ -1905,8 +2012,14 @@ en:
           Checksum type specified but "box_download_checksum" is blank
         box_download_checksum_notblank: |-
           Checksum specified but must also specify "box_download_checksum_type"
+        box_empty: "Box value for guest '%{machine_name}' is an empty string."
         box_missing: "A box must be specified."
+        box_download_options_type: |-
+          Found "box_download_options" specified as type '%{type}', should be a Hash
+        box_download_options_not_converted: |-
+          Something went wrong converting VM config `box_download_options`. Value for provided key '%{missing_key}' is invalid type. Should be String or Bool
         clone_and_box: "Only one of clone or box can be specified."
+        config_type: "Found '%{option}' specified as type '%{given}', should be '%{required}'"
         hostname_invalid_characters: |-
           The hostname set for the VM '%{name}' should only contain letters, numbers,
           hyphens or dots. It cannot start with a hyphen or dot.
@@ -1914,8 +2027,21 @@ en:
           Ignoring provider config for validation...
         multiple_primary_disks_error: |-
           There are more than one primary disks defined for guest '%{name}'. Please ensure that only one disk has been defined as a primary disk.
+        multiple_disk_files_error: |-
+          The following disk files are used multiple times in the disk
+          configuration for the VM '%{name}':
+
+          %{disk_files}
+
+          Each disk file may only be attached to a VM once.
         multiple_disk_names_error: |-
-          Duplicate disk names defined: '%{name}'. Disk names must be unique.
+          The following disks names are defined multiple times in the disk
+          configuration for the VM '%{name}':
+
+          %{disk_names}
+
+          Disk names must be unique.
+        multiple_networks_set_hostname: "Multiple networks have set `:hostname`"
         name_invalid: |-
           The sub-VM name '%{name}' is invalid. Please don't use special characters.
         network_ip_ends_in_one: |-
@@ -1934,6 +2060,7 @@ en:
           Forwarded port definitions require a "host" and "guest" value
         network_type_invalid: |-
           Network type '%{type}' is invalid. Please use a valid network type.
+        network_with_hostname_must_set_ip: "Network specified with `:hostname` must provide a static ip"
         provisioner_not_found: |-
           The '%{name}' provisioner could not be found.
         shared_folder_guestpath_duplicate: |-
@@ -1943,6 +2070,12 @@ en:
           The shared folder guest path must be absolute: %{path}
         shared_folder_hostpath_missing: |-
           The host path of the shared folder is missing: %{path}
+        shared_folder_invalid_option_type: |-
+          The type '%{type}' is not a valid synced folder type. If 'type' is not
+            specified, Vagrant will automatically choose the best synced folder
+            option for your guest. Otherwise, please pick from the following available options:
+
+              %{options}
         shared_folder_nfs_owner_group: |-
           Shared folders that have NFS enabled do not support owner/group
           attributes. Host path: %{path}
@@ -2158,11 +2291,62 @@ en:
 #-------------------------------------------------------------------------------
 # Translations for Vagrant middleware actions
 #-------------------------------------------------------------------------------
+    cap:
+      cleanup_disks:
+        disk_cleanup: |-
+          Disk '%{name}' no longer exists in Vagrant config. Removing and closing medium from guest...
+        disk_not_found: |-
+          Disk '%{name}' could not be found, and could not be properly removed. Please remove this disk manually if it still exists
+      configure_disks:
+        create_disk: |-
+          Disk '%{name}' not found in guest. Creating and attaching disk to guest...
+        floppy_not_supported: "Floppy disk configuration not yet supported. Skipping disk '%{name}'..."
+        shrink_size_not_supported: |-
+          VirtualBox does not support shrinking disk sizes. Cannot shrink '%{name}' disks size.
+        resize_disk: |-
+          Disk '%{name}' needs to be resized. Resizing disk...
+        recovery_from_resize: |-
+          Vagrant has encountered an exception while trying to resize a disk. It will now attempt to reattach the original disk, as to prevent any data loss.
+          The original disk is located at %{location}
+          If Vagrant fails to reattach the original disk, it is recommended that you open the VirtualBox GUI and navigate to the current guests settings for '%{name}' and look at the 'storage' section. Here is where you can reattach a missing disk if Vagrant fails to do so...
+        recovery_attached_disks: |-
+          Disk has been reattached. Vagrant will now continue on an raise the exception receieved
+        start: "Configuring storage mediums..."
+    cloud_init:
+      content_type_not_set: |-
+        'content_type' must be defined for a cloud_init config. Guest '%{machine}'
+        has not defined a 'content_type' for its cloud_init config. Valid options
+        supported by Vagrant are listed below:
+
+        %{accepted_types}
+      incorrect_content_type: |-
+        Content-type "%{content_type}" is not supported by Vagrant and
+        cloud-init on machine '%{machine}'. Valid options supported by Vagrant are
+        listed below:
+
+        %{accepted_types}
+      incorrect_inline_type: |-
+        The inline config cloud_init option for guest '%{machine}' is of type '%{type}', but
+        should be a String.
+      incorrect_path_type: |-
+        The path '%{path}' given for guest '%{machine}' is of type '%{type}'.
+        Config option 'path' must be a String.
+      incorrect_type_set: |-
+        The type '%{type}' defined for a cloud_init config with guest '%{machine}'
+        is not a valid type. Currently, Vagrant only supports type: '%{default_type}'.
+      path_and_inline_set: |-
+        Guest '%{machine}' defines both a 'path' and 'inline' for its cloud_init config,
+        however only one config option should be defined for cloud_init.
+      path_invalid: |-
+        The path '%{path}' defined for guest '%{machine}' cloud_init config was
+        not found on the system.
     actions:
       runner:
         waiting_cleanup: "Waiting for cleanup before exiting..."
         exit_immediately: "Exiting immediately, without cleanup!"
       disk:
+        cleanup_provider_unsupported: |-
+          Guest provider '%{provider}' does not support the cleaning up disks, and will not attempt to clean up attached disks on the guest..
         provider_unsupported: |-
           Guest provider '%{provider}' does not support the disk feature, and will not use the disk configuration defined.
       vm:
@@ -2228,6 +2412,8 @@ en:
           create_master:
             failure: |-
               Failed to create lock-file for master VM creation for box %{box}.
+        cloud_init_user_data_setup: |-
+          Preparing user data for cloud-init...
         customize:
           failure: |-
             A customization command failed:
@@ -2283,6 +2469,13 @@ en:
           forwarding: Forwarding ports...
           forwarding_entry: |-
             %{guest_port} (guest) => %{host_port} (host) (adapter %{adapter})
+          host_ip_not_found: |-
+            You are trying to forward a host IP that does not exist. Please set `host_ip`
+            to the address of an existing IPv4 network interface, or remove the option
+            from your port forward configuration.
+
+            VM: %{name}
+            Host IP: %{host_ip}
           non_nat: |-
             VirtualBox adapter #%{adapter} not configured as "NAT". Skipping port
             forwards on this adapter.
@@ -2365,6 +2558,17 @@ en:
             For more information see:
             RFC5661: https://tools.ietf.org/html/rfc5661#section-2.9.1
             RFC7530: https://tools.ietf.org/html/rfc7530#section-3.1
+        smb:
+          mfsymlink_warning: |-
+            Vagrant is currently configured to mount SMB folders with the
+            `mfsymlink` option enabled. This is equivalent to adding the
+            following to your Vagrantfile:
+
+              config.vm.synced_folder '/host/path', '/guest/path', type: "smb", mount_options: ['mfsymlink']
+
+            This option may be globally disabled with an environment variable:
+
+              VAGRANT_DISABLE_SMBMFSYMLINKS=1
 
         provision:
           beginning: "Running provisioner: %{provisioner}..."
@@ -2526,7 +2730,7 @@ en:
         missing_provisioner_name: |-
           Could not find provisioner name `%{name}` defined for machine `%{machine_name}` to run provisioner "%{provisioner_name}" `%{action}`.
         wrong_type: |-
-          Provisioner option `%{opt}` is not set as a valid type. Must be a string.
+          Provisioner option `%{opt}` is not set as a valid type. Must be a %{type}.
       chef:
         chef_not_detected: |-
           The chef binary (either `chef-solo` or `chef-client`) was not found on
@@ -2590,7 +2794,7 @@ en:
         server_url_required: |-
           Chef server provisioning requires that the `config.chef.chef_server_url` be set to the
           URL of your chef server. Examples include "http://12.12.12.12:4000" and
-          "http://myserver.com:4000" (the port of course can be different, but 4000 is the default)
+          "http://example.com:4000" (the port of course can be different, but 4000 is the default)
         server_validation_key_required: |-
           Chef server provisioning requires that the `config.chef.validation_key_path` configuration
           be set to a path on your local machine of the validation key used to register the
@@ -2784,6 +2988,12 @@ en:
         not_running: "Docker is not running on the guest VM."
         install_failed: "Docker installation failed."
 
+      podman:
+        wrong_provisioner: |-
+          The Podman post-install provisioner cannot also take a Podman post-install
+          provisioner
+        install_failed: "Podman installation failed."
+
       salt:
         minion_config_nonexist: |-
           The specified minion_config '%{missing_config_file}' file could not be found.
@@ -2805,3 +3015,9 @@ en:
     pushes:
       file:
         no_destination: "File destination must be specified."
+
+    autocomplete:
+      installed: |-
+        Autocomplete installed at paths:
+        - %{paths}
+      not_installed: "Autocomplete not installed"