diff --git a/lib/vagrant/driver/virtualbox.rb b/lib/vagrant/driver/virtualbox.rb index deb17daa0..a9fb9590f 100644 --- a/lib/vagrant/driver/virtualbox.rb +++ b/lib/vagrant/driver/virtualbox.rb @@ -203,7 +203,12 @@ module Vagrant ports = [] execute("list", "vms").split("\n").each do |line| if line =~ /^".+?" \{(.+?)\}$/ - read_forwarded_ports($1.to_s, true).each do |_, _, hostport, _| + uuid = $1.to_s + + # Ignore our own used ports + next if uuid == @uuid + + read_forwarded_ports(uuid, true).each do |_, _, hostport, _| ports << hostport end end diff --git a/lib/vagrant/guest/freebsd.rb b/lib/vagrant/guest/freebsd.rb index b22598574..a061057e5 100644 --- a/lib/vagrant/guest/freebsd.rb +++ b/lib/vagrant/guest/freebsd.rb @@ -33,7 +33,7 @@ module Vagrant # occur within a reasonable amount of time (15 seconds by default), # then simply return and allow Vagrant to kill the machine. count = 0 - while vm.vm.state != :powered_off + while vm.state != :powered_off count += 1 return if count >= vm.config.freebsd.halt_timeout diff --git a/lib/vagrant/guest/linux.rb b/lib/vagrant/guest/linux.rb index 3e876420d..b1153e1c2 100644 --- a/lib/vagrant/guest/linux.rb +++ b/lib/vagrant/guest/linux.rb @@ -31,7 +31,7 @@ module Vagrant # occur within a reasonable amount of time (15 seconds by default), # then simply return and allow Vagrant to kill the machine. count = 0 - while vm.vm.state != :powered_off + while vm.state != :powered_off count += 1 return if count >= vm.config.linux.halt_timeout diff --git a/lib/vagrant/guest/solaris.rb b/lib/vagrant/guest/solaris.rb index c8adf925f..519fd9ac5 100644 --- a/lib/vagrant/guest/solaris.rb +++ b/lib/vagrant/guest/solaris.rb @@ -68,7 +68,7 @@ module Vagrant # then simply return and allow Vagrant to kill the machine. count = 0 last_error = nil - while vm.vm.state != :powered_off + while vm.state != :powered_off begin ssh.exec!("#{vm.config.solaris.suexec_cmd} /usr/sbin/poweroff") rescue IOError => e diff --git a/lib/vagrant/util/subprocess.rb b/lib/vagrant/util/subprocess.rb index 67cac21d9..4c3f1274b 100644 --- a/lib/vagrant/util/subprocess.rb +++ b/lib/vagrant/util/subprocess.rb @@ -22,7 +22,7 @@ module Vagrant def execute # Build the ChildProcess - @logger.debug("Starting process: #{@command.inspect}") + @logger.info("Starting process: #{@command.inspect}") process = ChildProcess.build(*@command) # Create the pipes so we can read the output in real time as