Merge pull request #2824 from masteinhauser/patch-1

guests/solaris: More specific Solaris <11 detection.
This commit is contained in:
Mitchell Hashimoto 2014-01-15 20:11:18 -08:00
commit 1d2da09953
2 changed files with 2 additions and 2 deletions

View File

@ -7,7 +7,7 @@ module VagrantPlugins
# Contributed by Blake Irvin <b.irvin@modcloth.com>
class Guest < Vagrant.plugin("2", :guest)
def detect?(machine)
machine.communicate.test("uname -s | grep SunOS")
machine.communicate.test("uname -sr | grep SunOS | grep -v 5.11")
end
end
end

View File

@ -8,7 +8,7 @@ module VagrantPlugins
module GuestSolaris11
class Guest < Vagrant.plugin("2", :guest)
def detect?(machine)
machine.communicate.test("uname -s | grep SunOS")
machine.communicate.test("uname -sr | grep 'SunOS 5.11'")
end
end
end