From 01a8e502357aa0970310d5b73518247c44d8a001 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 20 May 2014 20:47:32 -0700 Subject: [PATCH] hosts/windows: use subprocess to execute mstsc [GH-3837] --- CHANGELOG.md | 2 ++ plugins/hosts/windows/cap/rdp.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37f8375c6..65f660cd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ BUG FIXES: not accessing the local host. [GH-3861] - guests/windows: Fix errors with arg lists that are too long over WinRM in some cases. [GH-3816] + - hosts/windows: Don't execute mstsc using PowerShell since it doesn't + exit properly. [GH-3837] - providers/docker: Never do graceful shutdown, always use `docker stop`. [GH-3798] - providers/docker: Better error messaging when SSH is not ready diff --git a/plugins/hosts/windows/cap/rdp.rb b/plugins/hosts/windows/cap/rdp.rb index e2278569a..a66703af6 100644 --- a/plugins/hosts/windows/cap/rdp.rb +++ b/plugins/hosts/windows/cap/rdp.rb @@ -1,6 +1,6 @@ require "tempfile" -require "vagrant/util/powershell" +require "vagrant/util/subprocess" module VagrantPlugins module HostWindows @@ -29,7 +29,7 @@ module VagrantPlugins end # Launch it - Vagrant::Util::PowerShell.execute("mstsc", *args) + Vagrant::Util::Subprocess.execute("mstsc", *args) ensure config.close if config end