Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[chef.git] / cookbooks / hardware / templates / default / grub.erb

diff --git a/cookbooks/hardware/templates/default/grub.erb b/cookbooks/hardware/templates/default/grub.erb
index b68b32651c88983c4eb09c31f45a0d756f5f94cc..305a5b0b0bdda433ceac4f6c20904687d082cac6 100644 (file)
--- a/cookbooks/hardware/templates/default/grub.erb
+++ b/cookbooks/hardware/templates/default/grub.erb
@@ -31,13 +31,8 @@ GRUB_RECORDFAIL_TIMEOUT=2
 # Send console output to the screen
 GRUB_TERMINAL="console"
 <% else -%>
-<% if node[:lsb][:release].to_f >= 12.04 -%>
 # Send console output to the screen and serial port
 GRUB_TERMINAL="console serial"
-<% else -%>
-# Send console output to the serial port
-GRUB_TERMINAL="serial"
-<% end -%>
 
 # Configure the serial console
 GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=<%= @units.first %> --word=8 --parity=no --stop=1"