-
Committer:
Package Import Robot
-
Author(s):
Colin Watson, Robert Millan, Colin Watson
-
Date:
2013-12-03 16:53:32 UTC
-
Revision ID:
package-import@ubuntu.com-20131203165332-6ao0wq900yihmmv9
Tags: 2.00-21
[ Robert Millan ]
* Backport from upstream:
- Accept ZFS version 5000 (feature based).
[ Colin Watson ]
* Silence error message on initial installation when /etc/default/grub
does not yet exist.
* Add GRUB_RECOVERY_TITLE option, to allow the controversial "recovery
mode" text to be customised (LP: #1240360).
* Backport from upstream:
- 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 the mess that
quick_boot.patch had made of /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.
- Fix build with FreeType 2.5.1.