From 21febf6b6aa888679deceaef539c5a269750676a Mon Sep 17 00:00:00 2001 From: Thomas Merkel Date: Thu, 25 Jan 2018 13:26:18 +0100 Subject: [PATCH 1/2] SmartOS should be an inheritance of solaris SmartOS is a distribution based on illumos which is the successor of OpenSolaris. --- plugins/guests/smartos/plugin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/guests/smartos/plugin.rb b/plugins/guests/smartos/plugin.rb index 6f5365af2..dcdd6f7b8 100644 --- a/plugins/guests/smartos/plugin.rb +++ b/plugins/guests/smartos/plugin.rb @@ -11,7 +11,7 @@ module VagrantPlugins Config end - guest(:smartos) do + guest(:smartos, :solaris) do require_relative "guest" Guest end From 93c571adbfab3c03fa2fa4cef406383eaf34d45d Mon Sep 17 00:00:00 2001 From: Thomas Merkel Date: Thu, 25 Jan 2018 13:28:15 +0100 Subject: [PATCH 2/2] Be sure solaris11 is Solaris version 11 and no distribution based on (Open)Solaris `uname -sr` return also 5.11 on OmniOS, SmartOS which is not the same as Oracle Solaris 11.x. SmartOS and OmniOS are inherit from Solaris and not from Solaris 11. For that reason we need a more explicit check that a solaris11 guest is a real Solaris version 11, for that reason the /etc/release file is checked. --- plugins/guests/solaris11/guest.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/guests/solaris11/guest.rb b/plugins/guests/solaris11/guest.rb index f7c46ee57..7d1794176 100644 --- a/plugins/guests/solaris11/guest.rb +++ b/plugins/guests/solaris11/guest.rb @@ -8,7 +8,7 @@ module VagrantPlugins module GuestSolaris11 class Guest < Vagrant.plugin("2", :guest) def detect?(machine) - machine.communicate.test("uname -sr | grep 'SunOS.*5\\.11'") + machine.communicate.test("grep 'Solaris 11' /etc/release") end end end