vagrant-unbundled 2.1.1.0 → 2.1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7b7d6c7467de5bfab5f4e3503f8cc1dab8ef0917a3373c3c42bda4519e86c0f3
-  data.tar.gz: c7912ae83539b93705099b5daad5481f247ed8b8abc9bee8ef996c8ccd58cb79
+SHA1:
+  metadata.gz: 796ded13459b0121dbade07679475b0fdab57a37
+  data.tar.gz: a420c1c394865925af51e70b8514164c8e68b685
 SHA512:
-  metadata.gz: b0374c64f53956fff0665b76baf2ff155f299b60d87664b7eb6d9f7cbae9fb53b6e1cd3f1a02d04a98555de4a4e708d70b21ea12a31a7c0a8530d050be6c9000
-  data.tar.gz: 8be3443a6d1a51a4f8c7ddd86aeb6deb839dfe5f63dde7fe209a6dcd9c5ab2884fe2ebc193d2d3706702a3a0d22d2af1253294eb9f8a72921c31d0e9f875be09
+  metadata.gz: 6f47ddc2a00f6441258cf826bb34c9bf0d3b10f8ef9f137e9fbeb44ef4edab418d6c8052bfc4a4858b970f768bc7b06e214c99e9e02c28eda2af9bbdad2bf14f
+  data.tar.gz: 6c59203df28a6959ba321197bfea08cc73581d008960a80811e390e9109a0a19ce41df944b5d66409cd3168fdb28d380c4cc1697a20ac15f1faf26d66b62f1ba

data/.travis.yml

@@ -10,9 +10,10 @@ addons:
     - bsdtar
 
 rvm:
-  - 2.3.6
-  - 2.4.3
+  - 2.3.7
+  - 2.4.4
   - 2.5.0
+  - 2.5.1
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 2.1.2 (June 26, 2018)
+
+IMPROVEMENTS:
+
+- commands/suspend: Introduce flag for suspending all machines [GH-9829]
+- commands/global-status: Improve message about removing stale entries [GH-9856]
+- provider/hyperv: Attempt to determine import failure cause [GH-9936]
+- provider/hyperv: Update implementation. Include support for modifications on reload [GH-9872]
+- provider/hyperv: Validate maxmemory configuration setting [GH-9932]
+- provider/hyperv: Enable provider within WSL [GH-9943]
+- provider/hyperv: Add Hyper-V accessibility check on data directory path [GH-9944]
+- provisioners/ansible_local: Improve installation from PPA on Ubuntu guests.
+    The compatibility is maintained only for active long-term support (LTS) versions,
+    i.e. Ubuntu 12.04 (Precise Pangolin) is no longer supported. [GH-9879]
+
+BUG FIXES:
+
+- communicator/ssh: Update ssh private key file permission handling on Windows [GH-9923, GH-9900]
+- core: Display plugin commands in help [GH-9808]
+- core: Ensure guestpath or name is set with synced_folder option and dont set guestpath if not provided [GH-9692]
+- guest/debian: Fix netplan generation when using DHCP [GH-9855]
+- guest/debain: Update priority of network configuration file when using networkd [GH-9867]
+- guest/ubuntu: Update netplan config generation to detect NetworkManager [GH-9824]
+- guest/ubuntu: Fix failing Ansible installation from PPA on Bionic Beaver (18.04 LTS) [GH-9796]
+- host/windows: Prevent processing of last SMB line when using net share [GH-9917]
+- provisioner/chef: Prevent node_name set on configuration with chef_apply [GH-9916]
+- provisioner/salt: Remove usage of masterless? config attribute [GH-9833]
+
 ## 2.1.1 (May 7, 2018)
 
 IMPROVEMENTS:

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/hashicorp/vagrant-spec.git
-  revision: f3daedaac493ebc0ba1a96c915423a329e09e84a
+  revision: 94a9d31ba18b4130b14da12a2f7b4001c3d2ff12
   specs:
     vagrant-spec (0.0.1)
       childprocess (~> 0.6.0)
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.1.1.0)
+    vagrant-unbundled (2.1.2.0)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
@@ -25,8 +25,6 @@ PATH
       rest-client (~> 2.0)
       ruby_dep (<= 1.3.1)
       wdm (~> 0.1.0)
-      win32-file (~> 0.8.1)
-      win32-file-security (~> 1.0.10)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
       winrm-fs (~> 1.0)
@@ -46,9 +44,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     fake_ftp (0.1.1)
-    ffi (1.9.23)
-    ffi-win32-extensions (1.0.3)
-      ffi
+    ffi (1.9.25)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -68,9 +64,9 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     multi_json (1.13.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -79,7 +75,7 @@ GEM
     net-ssh (4.2.0)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rake (12.0.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -119,16 +115,6 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    win32-file (0.8.1)
-      ffi
-      ffi-win32-extensions
-      win32-file-stat (>= 1.4.0)
-    win32-file-security (1.0.10)
-      ffi
-      ffi-win32-extensions
-    win32-file-stat (1.5.5)
-      ffi
-      ffi-win32-extensions
     winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
@@ -141,7 +127,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.2.0)
+    winrm-fs (1.2.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -160,4 +146,4 @@ DEPENDENCIES
   webmock (~> 2.3.1)
 
 BUNDLED WITH
-   1.16.2
+   1.16.0

data/README.md

@@ -43,25 +43,22 @@ the box doesn't already exist on your system.
 To learn how to build a fully functional development environment, follow the
 [getting started guide](https://www.vagrantup.com/docs/getting-started/index.html).
 
-## Installing the Gem from Git
+## Installing from Source
 
 If you want the bleeding edge version of Vagrant, we try to keep master pretty stable
 and you're welcome to give it a shot. Please review the installation page [here](https://www.vagrantup.com/docs/installation/source.html).
 
 ## Contributing to Vagrant
 
-To install Vagrant from source, please [follow the guide in the Wiki](https://github.com/hashicorp/vagrant/wiki/Installing-Vagrant-from-Source).
-
-You can run the test suite with:
+Once your Vagrant bundle is installed from Git repository, you can run the test suite with:
 
     bundle exec rake
 
-This will run the unit test suite, which should come back all green! Then you're good to go!
+This will run the unit test suite, which should come back all green!
 
-If you want to run Vagrant without having to install the gem, you may use `bundle exec`,
-like so:
+Please take time to read the [HashiCorp Community Guidelines](https://www.hashicorp.com/community-guidelines) and the [Vagrant Contributing Guide](https://github.com/hashicorp/vagrant/blob/master/.github/CONTRIBUTING.md).
 
-    bundle exec vagrant help
+Then you're good to go!
 
 ### Acceptance Tests
 

data/bin/vagrant

@@ -37,13 +37,18 @@ argv.each_index do |i|
   arg = argv[i]
 
   if !arg.start_with?("-")
-    if ["plugin", "help"].include?(arg) || (arg == "box" && argv[i+1] == "list")
+    if arg == "box" && argv[i+1] == "list"
       opts[:vagrantfile_name] = ""
       ENV['VAGRANT_NO_PLUGINS'] = "1"
     end
 
-    if arg == "plugin" && argv[i+1] != "list"
-      ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = "1"
+    # Do not load plugins when performing plugin operations
+    if arg == "plugin"
+      ENV['VAGRANT_NO_PLUGINS'] = "1"
+      # Only initialize plugins when listing installed plugins
+      if argv[i+1] != "list"
+        ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = "1"
+      end
     end
 
     break

data/lib/vagrant/box_collection.rb

@@ -116,7 +116,7 @@ module Vagrant
           # Extract the box into a temporary directory.
           @logger.debug("Unpacking box into temporary directory: #{temp_dir}")
           result = Util::Subprocess.execute(
-            "bsdtar", "-v", "-x", "-m", "-C", temp_dir.to_s, "-f", path.to_s)
+            "bsdtar", "-v", "-x", "-m", "-s", "|\\\\\|/|", "-C", temp_dir.to_s, "-f", path.to_s)
           if result.exit_code != 0
             raise Errors::BoxUnpackageFailure,
               output: result.stderr.to_s

data/lib/vagrant/bundler.rb

@@ -303,6 +303,15 @@ module Vagrant
       solution = request_set.resolve(installer_set)
       activate_solution(solution)
 
+      # Remove gems which are already installed
+      request_set.sorted_requests.delete_if do |activation_req|
+        rs_spec = activation_req.spec
+        if vagrant_internal_specs.detect{|ispec| ispec.name == rs_spec.name && ispec.version == rs_spec.version }
+          @logger.debug("Removing activation request from install. Already installed. (#{rs_spec.spec.full_name})")
+          true
+        end
+      end
+
       @logger.debug("Installing required gems.")
 
       # Install all remote gems into plugin path. Set the installer to ignore dependencies

data/lib/vagrant/errors.rb

@@ -300,6 +300,10 @@ module Vagrant
       error_key(:command_deprecated)
     end
 
+    class CommandSuspendAllArgs < VagrantError
+      error_key(:command_suspend_all_arguments)
+    end
+
     class CommandUnavailable < VagrantError
       error_key(:command_unavailable)
     end

data/lib/vagrant/util/platform.rb

@@ -393,6 +393,7 @@ module Vagrant
         # @return [String]
         def wsl_to_windows_path(path)
           if wsl? && wsl_windows_access? && !path.match(/^[a-zA-Z]:/)
+            path = File.expand_path(path.to_s)
             if wsl_path?(path)
               parts = path.split("/")
               parts.delete_if(&:empty?)
@@ -402,17 +403,15 @@ module Vagrant
               if root_path.end_with?("lxss") && !(["root", "home"].include?(parts.first))
                 root_path = "#{root_path}\\rootfs"
               end
-              [root_path, *parts].join("\\")
+              path = [root_path, *parts].join("\\")
             else
               path = path.to_s.sub("/mnt/", "")
               parts = path.split("/")
               parts.first << ":"
               path = parts.join("\\")
-              path
             end
-          else
-            path
           end
+          path.to_s
         end
 
         # Takes a windows path and formats it to the

data/lib/vagrant/util/powershell.rb

@@ -20,12 +20,20 @@ module Vagrant
         if !defined?(@_powershell_executable)
           @_powershell_executable = "powershell"
 
-          # Try to use WSL interoperability if PowerShell is not symlinked to
-          # the container.
-          if Which.which(@_powershell_executable).nil? && Platform.wsl?
-            @_powershell_executable += ".exe"
+          if Which.which(@_powershell_executable).nil?
+            # Try to use WSL interoperability if PowerShell is not symlinked to
+            # the container.
+            if Platform.wsl?
+              @_powershell_executable += ".exe"
 
-            if Which.which(@_powershell_executable).nil?
+              if Which.which(@_powershell_executable).nil?
+                @_powershell_executable = "/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe"
+
+                if Which.which(@_powershell_executable).nil?
+                  @_powershell_executable = nil
+                end
+              end
+            else
               @_powershell_executable = nil
             end
           end
@@ -41,19 +49,30 @@ module Vagrant
       # Execute a powershell script.
       #
       # @param [String] path Path to the PowerShell script to execute.
+      # @param [Array<String>] args Command arguments
+      # @param [Hash] opts Options passed to execute
+      # @option opts [Hash] :env Custom environment variables
       # @return [Subprocess::Result]
       def self.execute(path, *args, **opts, &block)
         validate_install!
         if opts.delete(:sudo) || opts.delete(:runas)
           powerup_command(path, args, opts)
         else
+          if mpath = opts.delete(:module_path)
+            m_env = opts.fetch(:env, {})
+            m_env["PSModulePath"] = "$env:PSModulePath+';#{mpath}'"
+            opts[:env] = m_env
+          end
+          if env = opts.delete(:env)
+            env = env.map{|k,v| "$env:#{k}=#{v}"}.join(";") + "; "
+          end
           command = [
             executable,
             "-NoLogo",
             "-NoProfile",
             "-NonInteractive",
             "-ExecutionPolicy", "Bypass",
-            "&('#{path}')",
+            "#{env}&('#{path}')",
             args
           ].flatten
 
@@ -68,10 +87,20 @@ module Vagrant
       # Execute a powershell command.
       #
       # @param [String] command PowerShell command to execute.
+      # @param [Hash] opts Extra options
+      # @option opts [Hash] :env Custom environment variables
       # @return [nil, String] Returns nil if exit code is non-zero.
       #   Returns stdout string if exit code is zero.
-      def self.execute_cmd(command)
+      def self.execute_cmd(command, **opts)
         validate_install!
+        if mpath = opts.delete(:module_path)
+          m_env = opts.fetch(:env, {})
+          m_env["PSModulePath"] = "$env:PSModulePath+';#{mpath}'"
+          opts[:env] = m_env
+        end
+        if env = opts.delete(:env)
+          env = env.map{|k,v| "$env:#{k}=#{v}"}.join(";") + "; "
+        end
         c = [
           executable,
           "-NoLogo",
@@ -79,7 +108,7 @@ module Vagrant
           "-NonInteractive",
           "-ExecutionPolicy", "Bypass",
           "-Command",
-          command
+          "#{env}#{command}"
         ].flatten.compact
 
         r = Subprocess.execute(*c)
@@ -91,9 +120,18 @@ module Vagrant
       #
       # @param [String] command PowerShell command to execute.
       # @param [Hash] opts A collection of options for subprocess::execute
+      # @option opts [Hash] :env Custom environment variables
       # @param [Block] block Ruby block
       def self.execute_inline(*command, **opts, &block)
         validate_install!
+        if mpath = opts.delete(:module_path)
+          m_env = opts.fetch(:env, {})
+          m_env["PSModulePath"] = "$env:PSModulePath+';#{mpath}'"
+          opts[:env] = m_env
+        end
+        if env = opts.delete(:env)
+          env = env.map{|k,v| "$env:#{k}=#{v}"}.join(";") + "; "
+        end
         c = [
           executable,
           "-NoLogo",
@@ -101,7 +139,7 @@ module Vagrant
           "-NonInteractive",
           "-ExecutionPolicy", "Bypass",
           "-Command",
-          command
+          "#{env}#{command}"
         ].flatten.compact
         c << opts
 

data/lib/vagrant.rb

@@ -65,12 +65,6 @@ require 'i18n'
 # there are issues with ciphers not being properly loaded.
 require 'openssl'
 
-# If we are on Windows, load in File helpers
-if Vagrant::Util::Platform.windows?
-  require "ffi-win32-extensions"
-  require "win32/file/security"
-end
-
 # Always make the version available
 require 'vagrant/version'
 global_logger = Log4r::Logger.new("vagrant::global")
@@ -288,7 +282,7 @@ end
 if Vagrant.plugins_init?
   begin
     Vagrant::Bundler.instance.init!(plugins)
-  rescue Exception => e
+  rescue StandardError, ScriptError => e
     global_logger.error("Plugin initialization error - #{e.class}: #{e}")
     e.backtrace.each do |backtrace_line|
       global_logger.debug(backtrace_line)
@@ -334,18 +328,16 @@ if Vagrant.plugins_enabled?
     plugins.each do |plugin_name, plugin_info|
       if plugin_info["require"].to_s.empty?
         begin
-          global_logger.debug("Loading plugin `#{plugin_name}` with default require: `#{plugin_name}`")
+          global_logger.info("Loading plugin `#{plugin_name}` with default require: `#{plugin_name}`")
           require plugin_name
-        rescue LoadError, Gem::LoadError => load_error
+        rescue LoadError => err
           if plugin_name.include?("-")
-            begin
-              plugin_slash = plugin_name.gsub("-", "/")
-              global_logger.debug("Failed to load plugin `#{plugin_name}` with default require.")
-              global_logger.debug("Loading plugin `#{plugin_name}` with slash require: `#{plugin_slash}`")
-              require plugin_slash
-            rescue LoadError, Gem::LoadError
-              global_logger.warn("Failed to load plugin `#{plugin_name}`. Assuming library and moving on.")
-            end
+            plugin_slash = plugin_name.gsub("-", "/")
+            global_logger.error("Failed to load plugin `#{plugin_name}` with default require. - #{err.class}: #{err}")
+            global_logger.info("Loading plugin `#{plugin_name}` with slash require: `#{plugin_slash}`")
+            require plugin_slash
+          else
+            raise
           end
         end
       else
@@ -358,12 +350,12 @@ if Vagrant.plugins_enabled?
       global_logger.debug("Bundler detected in use. Loading `:plugins` group.")
       ::Bundler.require(:plugins)
     end
-  rescue Exception => e
-    global_logger.error("Plugin loading error: #{e.class} - #{e}")
-    e.backtrace.each do |backtrace_line|
+  rescue ScriptError, StandardError => err
+    global_logger.error("Plugin loading error: #{err.class} - #{err}")
+    err.backtrace.each do |backtrace_line|
       global_logger.debug(backtrace_line)
     end
-    raise Vagrant::Errors::PluginLoadError, message: e.to_s
+    raise Vagrant::Errors::PluginLoadError, message: err.to_s
   end
 else
   global_logger.debug("Plugin loading is currently disabled.")

data/plugins/commands/suspend/command.rb

@@ -8,8 +8,13 @@ module VagrantPlugins
       end
 
       def execute
+        options = {}
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant suspend [name|id]"
+          o.banner = "Usage: vagrant suspend [options] [name|id]"
+          o.separator ""
+          o.on("-a", "--all-global", "Suspend all running vms globally.") do |p|
+            options[:all] = true
+          end
         end
 
         # Parse the options
@@ -17,7 +22,19 @@ module VagrantPlugins
         return if !argv
 
         @logger.debug("'suspend' each target VM...")
-        with_target_vms(argv) do |vm|
+        target = []
+        if options[:all]
+          if argv.size > 0
+            raise Vagrant::Errors::CommandSuspendAllArgs
+          end
+
+          m = @env.machine_index.each { |m| m }
+          target = m.keys
+        else
+          target = argv
+        end
+
+        with_target_vms(target) do |vm|
           vm.action(:suspend)
         end
 

data/plugins/communicators/ssh/communicator.rb

@@ -194,17 +194,9 @@ module VagrantPlugins
             f.write(priv)
           end
 
-          # Adjust private key file permissions
-          if Vagrant::Util::Platform.windows?
-            begin
-              priv_path = @machine.data_dir.join("private_key").to_s
-              File.set_permissions(priv_path, Etc.getlogin => File::FULL)
-            rescue => e
-              @logger.warn("Error encountered during private key permissions set - " \
-                "#{e.class}: #{e.message}")
-            end
-          else
-            @machine.data_dir.join("private_key").chmod(0600)
+          # Adjust private key file permissions if host provides capability
+          if @machine.env.host.capability?(:set_ssh_key_permissions)
+            @machine.env.host.capability(:set_ssh_key_permissions, @machine.data_dir.join("private_key"))
           end
 
           # Remove the old key if it exists

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

@@ -37,7 +37,9 @@ module VagrantPlugins
           ethernets = {}.tap do |e_nets|
             networks.each do |network|
               e_config = {}.tap do |entry|
-                if network[:ip]
+                if network[:type].to_s == "dhcp"
+                  entry["dhcp4"] = true
+                else
                   mask = network[:netmask]
                   if mask && IPAddr.new(network[:ip]).ipv4?
                     begin
@@ -47,8 +49,6 @@ module VagrantPlugins
                     end
                   end
                   entry["addresses"] = [[network[:ip], mask].compact.join("/")]
-                else
-                  entry["dhcp4"] = true
                 end
                 if network[:gateway]
                   entry["gateway4"] = network[:gateway]
@@ -57,8 +57,20 @@ module VagrantPlugins
               e_nets[interfaces[network[:interface]]] = e_config
             end
           end
+
+          # 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
+            end
+          end
+
           np_config = {"network" => {"version" => NETPLAN_DEFAULT_VERSION,
-            "renderer" => NETPLAN_DEFAULT_RENDERER, "ethernets" => ethernets}}
+            "renderer" => renderer, "ethernets" => ethernets}}
 
           remote_path = upload_tmp_file(comm, np_config.to_yaml)
           dest_path = "#{NETPLAN_DIRECTORY}/50-vagrant.yaml"
@@ -97,7 +109,7 @@ module VagrantPlugins
           end
 
           remote_path = upload_tmp_file(comm, net_conf.join("\n"))
-          dest_path = "#{NETWORKD_DIRECTORY}/99-vagrant.network"
+          dest_path = "#{NETWORKD_DIRECTORY}/50-vagrant.network"
           comm.sudo(["mkdir -p #{NETWORKD_DIRECTORY}",
             "mv -f '#{remote_path}' '#{dest_path}'",
             "chown root:root '#{dest_path}'",

data/plugins/hosts/bsd/cap/ssh.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module HostBSD
+    module Cap
+      class SSH
+        # Set the ownership and permissions for SSH
+        # private key
+        #
+        # @param [Vagrant::Environment] env
+        # @param [Pathname] key_path
+        def self.set_ssh_key_permissions(env, key_path)
+          key_path.chmod(0600)
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/bsd/plugin.rb

@@ -35,6 +35,11 @@ module VagrantPlugins
         require_relative "cap/nfs"
         Cap::NFS
       end
+
+      host_capability("bsd", "set_ssh_key_permissions") do
+        require_relative "cap/ssh"
+        Cap::SSH
+      end
     end
   end
 end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module HostLinux
+    module Cap
+      class SSH
+        # Set the ownership and permissions for SSH
+        # private key
+        #
+        # @param [Vagrant::Environment] env
+        # @param [Pathname] key_path
+        def self.set_ssh_key_permissions(env, key_path)
+          key_path.chmod(0600)
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/linux/plugin.rb

@@ -47,6 +47,11 @@ module VagrantPlugins
         require_relative "cap/nfs"
         Cap::NFS
       end
+
+      host_capability("linux", "set_ssh_key_permissions") do
+        require_relative "cap/ssh"
+        Cap::SSH
+      end
     end
   end
 end

data/plugins/hosts/windows/cap/smb.rb

@@ -38,7 +38,7 @@ module VagrantPlugins
 
           m_id = machine_id(machine)
           prune_shares = existing_shares.map do |share_name, share_info|
-            if share_info["Description"].start_with?("vgt-#{m_id}-")
+            if share_info["Description"].to_s.start_with?("vgt-#{m_id}-")
               @@logger.info("removing smb share name=#{share_name} id=#{m_id}")
               share_name
             else
@@ -129,7 +129,7 @@ module VagrantPlugins
         #
         # @return [Hash]
         def self.get_smbshares
-          result = Vagrant::Util::PowerShell.execute_cmd("Get-SmbShare|Format-List")
+          result = Vagrant::Util::PowerShell.execute_cmd("Get-SmbShare|Format-List|Out-String -Width 4096")
           if result.nil?
             return nil
           end
@@ -151,7 +151,7 @@ module VagrantPlugins
         #
         # @return [Hash]
         def self.get_netshares
-          result = Vagrant::Util::PowerShell.execute_cmd("net share")
+          result = Vagrant::Util::PowerShell.execute_cmd("net share | Out-String -Width 4096")
           if result.nil?
             return nil
           end
@@ -159,10 +159,12 @@ module VagrantPlugins
           share_names = result.strip.split("\n").map do |line|
             line.strip.split(/\s+/).first
           end
+          # Last item is command completion notification so remove it
+          share_names.pop
           shares = {}
           share_names.each do |share_name|
             shares[share_name] = {}
-            result = Vagrant::Util::PowerShell.execute_cmd("net share #{share_name}")
+            result = Vagrant::Util::PowerShell.execute_cmd("net share #{share_name} |  Out-String -Width 4096")
             next if result.nil?
             result.each_line do |line|
               key, value = line.strip.split(/\s+/, 2)