From 4d26f01b7bc586ee2f558c8c32b9c1e4fe65713b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 1 May 2013 19:02:00 -0700 Subject: [PATCH] SmartOS should be OmniOS --- CHANGELOG.md | 2 +- .../guests/{smartos => omnios}/cap/change_host_name.rb | 2 +- plugins/guests/{smartos => omnios}/guest.rb | 4 ++-- plugins/guests/{smartos => omnios}/plugin.rb | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) rename plugins/guests/{smartos => omnios}/cap/change_host_name.rb (95%) rename plugins/guests/{smartos => omnios}/guest.rb (60%) rename plugins/guests/{smartos => omnios}/plugin.rb (58%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9f5e949d..45375de31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ FEATURES: IMPROVEMENTS: - - Setting hostnames works properly on SmartOS. [GH-1672] + - Setting hostnames works properly on OmniOS. [GH-1672] - Better VBoxManage error detection on Windows systems. This avoids some major issues where Vagrant would sometimes "lose" your VM. [GH-1669] - Better detection of missing VirtualBox kernel drivers on Linux diff --git a/plugins/guests/smartos/cap/change_host_name.rb b/plugins/guests/omnios/cap/change_host_name.rb similarity index 95% rename from plugins/guests/smartos/cap/change_host_name.rb rename to plugins/guests/omnios/cap/change_host_name.rb index f839cf467..13f70f304 100644 --- a/plugins/guests/smartos/cap/change_host_name.rb +++ b/plugins/guests/omnios/cap/change_host_name.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module GuestSmartOS + module GuestOmniOS module Cap class ChangeHostName def self.change_host_name(machine, name) diff --git a/plugins/guests/smartos/guest.rb b/plugins/guests/omnios/guest.rb similarity index 60% rename from plugins/guests/smartos/guest.rb rename to plugins/guests/omnios/guest.rb index d72b68186..7474b020b 100644 --- a/plugins/guests/smartos/guest.rb +++ b/plugins/guests/omnios/guest.rb @@ -1,10 +1,10 @@ require "vagrant" module VagrantPlugins - module GuestSmartOS + module GuestOmniOS class Guest < Vagrant.plugin("2", :guest) def detect?(machine) - machine.communicate.test("cat /etc/release | grep -i SmartOS") + machine.communicate.test("cat /etc/release | grep -i OmniOS") end end end diff --git a/plugins/guests/smartos/plugin.rb b/plugins/guests/omnios/plugin.rb similarity index 58% rename from plugins/guests/smartos/plugin.rb rename to plugins/guests/omnios/plugin.rb index e8f84bb39..929132cf8 100644 --- a/plugins/guests/smartos/plugin.rb +++ b/plugins/guests/omnios/plugin.rb @@ -1,17 +1,17 @@ require "vagrant" module VagrantPlugins - module GuestSmartOS + module GuestOmniOS class Plugin < Vagrant.plugin("2") - name "SmartOS guest." - description "SmartOS guest support." + name "OmniOS guest." + description "OmniOS guest support." - guest("smartos", "solaris") do + guest("omnios", "solaris") do require File.expand_path("../guest", __FILE__) Guest end - guest_capability("smartos", "change_host_name") do + guest_capability("omnios", "change_host_name") do require_relative "cap/change_host_name" Cap::ChangeHostName end