Merge pull request #83 from enkidushane/grub_timeout_style

Grub timeout style

Author: goldyfruit

README.md

@@ -148,6 +148,10 @@ This module manages GRUB 2 bootloader (Hiera & EFI)
 - Define how long (in seconds) that the menu should appear
 - **INTEGER** : *5*
 
+#### timeout_style
+- Define what to display while waiting for timeout to expire
+- **STRING** : *'countdown'*
+
 #### tune
 - Define if GRUB should make a beep when he starts
 - **STRING** : *Empty by default*

data/common.yml

@@ -15,7 +15,7 @@ grub2::disable_uuid: false
 grub2::enable_cryptodisk: false
 grub2::enable_blscfg: false
 grub2::hidden_timeout: ~
-grub2::hidden_timeout_quiet: false
+grub2::hidden_timeout_quiet: ~
 grub2::install_grub: false
 grub2::remove_grub_legacy: false
 grub2::package_ensure: present
@@ -31,5 +31,6 @@ grub2::serial_command: ''
 grub2::suse_btrfs_snapshot_booting: false
 grub2::terminal: ''
 grub2::timeout: 5
+grub2::timeout_style: 'countdown'
 grub2::tune: ''
 grub2::update_grub: true

manifests/init.pp

@@ -138,6 +138,10 @@
 #   Define how long (in seconds) that the menu should appear
 #   INTEGER : 5
 #
+# [*timeout_style*]
+#   Define what to display while waiting for timeout to expire
+#   STRING : 'countdown'
+#
 # [*tune*]
 #   Define if GRUB should make a beep when he starts
 #   STRING : Empty by default
@@ -205,7 +209,7 @@
   Boolean $enable_cryptodisk                        = $grub2::params::enable_cryptodisk,
   String $gfxmode                                   = $grub2::params::gfxmode,
   Optional[String] $hidden_timeout                  = $grub2::params::hidden_timeout,
-  Boolean $hidden_timeout_quiet                     = $grub2::params::hidden_timeout_quiet,
+  Optional[Boolean] $hidden_timeout_quiet           = $grub2::params::hidden_timeout_quiet,
   Stdlib::Absolutepath $install_binary              = $grub2::params::install_binary,
   Boolean $install_grub                             = $grub2::params::install_grub,
   Boolean $remove_grub_legacy                       = $grub2::params::remove_grub_legacy,
@@ -223,10 +227,21 @@
   Boolean $suse_btrfs_snapshot_booting              = $grub2::params::suse_btrfs_snapshot_booting,
   String $terminal                                  = $grub2::params::terminal,
   Integer $timeout                                  = $grub2::params::timeout,
+  String $timeout_style                             = $grub2::params::timeout_style,
   String $tune                                      = $grub2::params::tune,
   Stdlib::Absolutepath $update_binary               = $grub2::params::update_binary,
   Boolean $update_grub                              = $grub2::params::update_grub,
 ) inherits grub2::params {
+
+  # Warn if timeout_style and either of the hidden_timout values are set, and respect old syntax
+  if defined('$timeout_style') and ( $hidden_timeout_quiet =~ Boolean or $hidden_timeout =~ String) ) {
+    notify { 'Newer timeout_style and at least one of deprecated hidden_timeout(_quiet)? defined at the same time.  Using deprecated syntax, but you should fix this.': }
+    $timeout_style_disable = true
+  } else {
+    $timeout_style_disable = false
+  }
+}
+
   anchor { 'grub2::begin': }
   -> class { '::grub2::install': }
   ~> class { '::grub2::config': }

manifests/params.pp

@@ -18,7 +18,7 @@
   $enable_cryptodisk           = false
   $gfxmode                     = ''
   $hidden_timeout              = undef
-  $hidden_timeout_quiet        = false
+  $hidden_timeout_quiet        = undef
   $install_grub                = false
   $remove_grub_legacy          = false
   $package_ensure              = 'present'
@@ -34,6 +34,7 @@
   $suse_btrfs_snapshot_booting = false
   $terminal                    = ''
   $timeout                     = 5
+  $timeout_style               = 'countdown'
   $tune                        = ''
   $update_grub                 = true
 

templates/default_grub.erb

@@ -2,12 +2,19 @@
 # Editing is no use unless you avoid running the Puppet agent
 
 GRUB_DEFAULT=<%= @default_entry %>
+<% if @timeout_style != nil and ! @timeout_style_disable -%>
+GRUB_TIMEOUT_STYLE="<%= @timeout_style %>"
+<% end -%>
 GRUB_TIMEOUT=<%= @timeout %>
-<% if @hidden_timeout != nil -%>
+<% if @timeout_style_disable -%>
+<%   if @hidden_timeout != nil -%>
 GRUB_HIDDEN_TIMEOUT=<%= @hidden_timeout %>
-<% end -%>
-<% if @hidden_timeout_quiet != nil -%>
+<%   end -%>
+<%   if @hidden_timeout_quiet != nil -%>
 GRUB_HIDDEN_TIMEOUT_QUIET="<%= @hidden_timeout_quiet %>"
+<%   else -%>
+GRUB_HIDDEN_TIMEOUT_QUIET="false"
+<%   end -%>
 <% end -%>
 GRUB_DISTRIBUTOR=<%= @distributor %>
 <% if @cmdline_linux_default != nil -%>