haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9398 from drscream/smartos-inheritance-solaris 

More explicit Solaris 11 and inherit SmartOS from Solaris
This commit is contained in:
Brian Cain 2018-02-12 15:02:30 -08:00 committed by GitHub
parent a7431368bd 93c571adbf
commit 279bceffb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/guests/smartos/plugin.rb
View File

@ -11,7 +11,7 @@ module VagrantPlugins
Config Config
end end
guest(:smartos) do guest(:smartos, :solaris) do
require_relative "guest" require_relative "guest"
Guest Guest
end end

2
plugins/guests/solaris11/guest.rb
View File

@ -8,7 +8,7 @@ module VagrantPlugins
module GuestSolaris11 module GuestSolaris11
class Guest < Vagrant.plugin("2", :guest) class Guest < Vagrant.plugin("2", :guest)
def detect?(machine) def detect?(machine)
machine.communicate.test("uname -sr | grep 'SunOS.*5\\.11'") machine.communicate.test("grep 'Solaris 11' /etc/release")
end end
end end
end end