nominatim: temporarily disable cleanup of WAL archive

[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 d69a870b9cf862874bc3d69abe4b2bb92b670f8d..3db55919188f5608bd7b85245bee0880e3fc526a 100644 (file)
--- a/cookbooks/hardware/templates/default/grub.erb
+++ b/cookbooks/hardware/templates/default/grub.erb
@@ -2,22 +2,7 @@
 
 # Boot the first entry by default, unless we have configured
 # it to boot a specific version.
 
 # Boot the first entry by default, unless we have configured
 # it to boot a specific version.

-<% if node[:hardware][:grub][:kernel] == :latest %>
-GRUB_DEFAULT="0"
-<% else
-  df = Mixlib::ShellOut.new("df /boot/grub/grub.cfg | tail -n 1 | awk '{print $1;}'")
-  df.run_command
-  df.error!
-  root=df.stdout
-
-  blkid = Mixlib::ShellOut.new("blkid -o value -s UUID #{root}")
-  blkid.run_command
-  blkid.error!
-  uuid=blkid.stdout
-
-  version="#{node[:hardware][:grub][:kernel]}-generic" %>
-GRUB_DEFAULT="gnulinux-advanced-<%= uuid %>>gnulinux-<%= version %>-advanced-<%= uuid %>"
-<% end %>
+GRUB_DEFAULT="<%= @entry %>"

 
 # Wait two seconds before booting the default entry
 GRUB_TIMEOUT="2"
 
 # Wait two seconds before booting the default entry
 GRUB_TIMEOUT="2"