-
Committer:
Package Import Robot
-
Author(s):
Colin Watson, Adam Conrad, Colin Watson
-
Date:
2013-01-21 10:49:00 UTC
-
Revision ID:
package-import@ubuntu.com-20130121104900-fhvuylh23u29krqy
Tags: 2.00-11
[ Adam Conrad ]
* debian/{postinst,config}.in: Don't fail if /etc/default/grub.d
configuration snippets exist, but /etc/default/grub does not.
[ Colin Watson ]
* Merge wheezy branch up to 1.99-27, fixing overzealous removal of
load_video call when GRUB_GFXPAYLOAD_LINUX is empty (closes: #661789).
* Merge from Ubuntu:
- If the postinst is running in a container, skip grub-install and all
its associated questions (LP: #1060404).
- Fix backslash-escaping in merge_debconf_into_conf (LP: #448413). Note
that this differs slightly from the fix in Ubuntu, which corrected
behaviour when amending an existing configuration item but
accidentally over-escaped when adding a new one.
- Replace "single" with "recovery" when friendly-recovery is installed
(LP: #575469).
- Adjust versions of grub-doc and grub-legacy-doc conflicts to tolerate
Ubuntu's backport of the grub-doc split (LP: #493968).