~hamo/ubuntu/precise/grub2/grub2.lp1297128

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_linux_submenus.patch

  • Committer: Colin Watson
  • Date: 2013-12-04 14:01:16 UTC
  • Revision ID: cjwatson@canonical.com-20131204140116-xrlm630n0613wwfg
Revamp hidden timeout handling by adding a new timeout_style environment
variable and a corresponding GRUB_TIMEOUT_STYLE configuration key for
grub-mkconfig.  This controls hidden-timeout handling more simply than
the previous arrangements, and pressing any hotkeys associated with menu
entries during the hidden timeout will now boot the corresponding menu
entry immediately (LP: #1178618).  As part of merging this, radically
simplify /etc/grub.d/30_os-prober; if it finds other OSes it can now
just set timeout_style=menu and make sure the timeout is non-zero.

Show diffs side-by-side

added added

removed removed

Lines of Context:
9
9
--- a/util/grub.d/10_linux.in
10
10
+++ b/util/grub.d/10_linux.in
11
11
@@ -177,6 +177,7 @@
12
 
 if [ "\$linux_gfx_mode" != "text" ]; then load_video; fi
 
12
 if [ "\${linux_gfx_mode}" != "text" ]; then load_video; fi
13
13
 EOF
14
14
 
15
15
+in_submenu=false