From 4b7aea286bd82cf0c86e92319742c31bad356b8d Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 30 Jun 2015 20:22:17 +0100
Subject: [PATCH] Add ghes.disable=1 to boot options on ramoth

---
 cookbooks/hardware/attributes/default.rb      | 1 +
 cookbooks/hardware/templates/default/grub.erb | 4 ++--
 roles/ramoth.rb                               | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 174190f3f..b558f9d8e 100644
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,4 +1,5 @@
 default[:hardware][:modules] = %w(loop lp rtc)
+default[:hardware][:grub][:cmdline] = %w(nomodeset)
 default[:hardware][:sensors] = {}
 
 if node[:dmi] && node[:dmi][:system]
diff --git a/cookbooks/hardware/templates/default/grub.erb b/cookbooks/hardware/templates/default/grub.erb
index 4042a813b..1c19cf684 100644
--- a/cookbooks/hardware/templates/default/grub.erb
+++ b/cookbooks/hardware/templates/default/grub.erb
@@ -15,9 +15,9 @@ GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
 
 # Arguments to add to the kernel command line (all entries)
 <% if @unit.nil? -%>
-GRUB_CMDLINE_LINUX="nomodeset"
+GRUB_CMDLINE_LINUX="<%= node[:hardware][:grub][:cmdline].join(" ") %>"
 <% else -%>
-GRUB_CMDLINE_LINUX="console=tty0 console=ttyS<%= @unit %>,115200n8 nomodeset"
+GRUB_CMDLINE_LINUX="console=tty0 console=ttyS<%= @unit %>,115200n8 <%= node[:hardware][:grub][:cmdline].join(" ") %>"
 <% end -%>
 
 # Arguments to add to the kernel command line (except recovery entries)
diff --git a/roles/ramoth.rb b/roles/ramoth.rb
index 32a0499c9..896d99c6d 100644
--- a/roles/ramoth.rb
+++ b/roles/ramoth.rb
@@ -28,6 +28,9 @@ default_attributes(
     }
   },
   :hardware => {
+    :grub => {
+      :cmdline => %w(ghes.disable=1)
+    },
     :watchdog => "w83627hf_wdt"
   },
   :munin => {
-- 
2.43.2