- partial PLD merge

[packages/grub2.git] / grub.sysconfig

diff --git a/grub.sysconfig b/grub.sysconfig
index f59916de019d0a428e9f056cb193c07a11af9a5f..0c2f1816f584299e8311d898094c1e56263fbe90 100644 (file)
--- a/grub.sysconfig
+++ b/grub.sysconfig
@@ -4,7 +4,7 @@
 #
 # To disable auto generation of /boot/grub/grub.conf on kernel package
 # install/upgrade, UPDATE_GRUB must be set to "no".
-#UPDATE_GRUB=yes
+#UPDATE_GRUB=no
 
 # Default entry to boot. Numeric value starting with 0.
 # Use special value 'saved' to stick with last booted entry. used with GRUB_SAVEDEFAULT
@@ -13,15 +13,21 @@ GRUB_DEFAULT=0
 # save_default_entry
 #GRUB_SAVEDEFAULT=true
 
+# Boot the default entry this many seconds after the menu is displayed, unless a key
+# is pressed. Set to 0 to boot immediately without displaying the menu, or to -1 to
+# wait indefinitely. 
 GRUB_TIMEOUT=15
 
+# Wait this many seconds for a key to be pressed before displaying the menu.
+#GRUB_HIDDEN_TIMEOUT=15
+
 # Unless `GRUB_DISABLE_RECOVERY' is set to `true', two menu entries
 # will be generated for each Linux kernel: one default entry and one
 # entry for recovery mode. This option lists command-line arguments
 # to add only to the default menu entry, after those listed in
 # `GRUB_CMDLINE_LINUX'.
 # To disable IPv6 in kernel, append: ipv6.disable=1
-GRUB_CMDLINE_LINUX_DEFAULT="panic=120 quiet"
+GRUB_CMDLINE_LINUX_DEFAULT="panic=300 quiet"
 
 # Command-line arguments to add to menu entries for the Linux kernel.
 GRUB_CMDLINE_LINUX=""