From 337eec2d07f3833fe7b75e612081591f007e5ce8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 7 Sep 2010 14:19:06 -0700
Subject: [PATCH] Fork-and-wait on Tiger as well as leopard. [related to GH-51]

---
 lib/vagrant/ssh.rb           | 2 +-
 lib/vagrant/util/platform.rb | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/ssh.rb b/lib/vagrant/ssh.rb
index 980dd22ef..c54466237 100644
--- a/lib/vagrant/ssh.rb
+++ b/lib/vagrant/ssh.rb
@@ -42,7 +42,7 @@ module Vagrant
       # (GH-51). As a workaround, we fork and wait. On all other platforms,
       # we simply exec.
       pid = nil
-      pid = fork if Util::Platform.leopard?
+      pid = fork if Util::Platform.leopard? || Util::Platform.tiger?
       Kernel.exec "ssh #{command_options.join(" ")} #{options[:username]}@#{options[:host]}".strip if pid.nil?
       Process.wait(pid) if pid
     end
diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index 8be0e4fe6..903136f02 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -5,8 +5,12 @@ module Vagrant
     # This class just contains some platform checking code.
     class Platform
       class << self
+        def tiger?
+          platform.include?("darwin8")
+        end
+
         def leopard?
-          RUBY_PLATFORM.downcase.include?("darwin9")
+          platform.include?("darwin9")
         end
 
         [:darwin, :bsd, :linux].each do |type|