X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/69830edd35a089ff74ff5ba6d15c0425595648bd..4c86175022c9036999f9d8341e48cbd884448709:/cookbooks/hardware/templates/default/grub.erb 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)