From 55da086f5fc2c948316e32c21678c4bae597bfd1 Mon Sep 17 00:00:00 2001
From: BJ Dierkes <derks@datafolklabs.com>
Date: Wed, 12 Apr 2017 01:12:01 -0500
Subject: [PATCH 1/2] Support for Elementary OS 0.4 - Issue #8471

---
 CHANGELOG.md                        |  1 +
 plugins/guests/elementary/guest.rb  | 10 ++++++++++
 plugins/guests/elementary/plugin.rb | 15 +++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 plugins/guests/elementary/guest.rb
 create mode 100644 plugins/guests/elementary/plugin.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0e4087f1..836ff2117 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ FEATURES:
 
   - command/validate: Add Vagrantfile validation command [GH-8264, GH-8151]
   - provider/hyperv: Support integration services configuration [GH-8379, GH-8378]
+  - guest/elementary: Support for Elementary OS [GH-8471]
 
 IMPROVEMENTS:
 
diff --git a/plugins/guests/elementary/guest.rb b/plugins/guests/elementary/guest.rb
new file mode 100644
index 000000000..386d330a4
--- /dev/null
+++ b/plugins/guests/elementary/guest.rb
@@ -0,0 +1,10 @@
+require_relative '../linux/guest'
+
+module VagrantPlugins
+  module GuestElementary
+    class Guest < VagrantPlugins::GuestLinux::Guest
+      # Name used for guest detection
+      GUEST_DETECTION_NAME = "elementary".freeze
+    end
+  end
+end
diff --git a/plugins/guests/elementary/plugin.rb b/plugins/guests/elementary/plugin.rb
new file mode 100644
index 000000000..574cfc4e3
--- /dev/null
+++ b/plugins/guests/elementary/plugin.rb
@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestElementary
+    class Plugin < Vagrant.plugin("2")
+      name "Elementary guest"
+      description "Elementary guest support."
+
+      guest(:elementary, :ubuntu) do
+        require_relative "guest"
+        Guest
+      end
+    end
+  end
+end

From 9d445f86755f3cdc0b460eae9aabe067214dc47e Mon Sep 17 00:00:00 2001
From: BJ Dierkes <derks@datafolklabs.com>
Date: Wed, 12 Apr 2017 20:30:01 -0500
Subject: [PATCH 2/2] Removing CHANGELOG Entry Per Reviewer Request

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 836ff2117..e0e4087f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,6 @@ FEATURES:
 
   - command/validate: Add Vagrantfile validation command [GH-8264, GH-8151]
   - provider/hyperv: Support integration services configuration [GH-8379, GH-8378]
-  - guest/elementary: Support for Elementary OS [GH-8471]
 
 IMPROVEMENTS: