Commit Graph

8762 Commits

Author SHA1 Message Date
Colin Watson
d48c35a473 * Merge from Ubuntu:
- source_grub2.py: Use attach_default_grub from apport's hookutils.
2013-01-29 05:38:34 +00:00
Colin Watson
21a37187f5 Stop using the /usr/share/images/desktop-base/desktop-grub.png
alternative as the fallback background if GRUB_DISTRIBUTOR is "Ubuntu".
2013-01-29 05:31:42 +00:00
Colin Watson
1dcca7d52b * Backport from upstream:
- Fix booting FreeBSD >= 9.1 amd64 kernels (closes: #699002).
2013-01-28 11:09:55 +00:00
Colin Watson
90521ecd2a releasing version 2.00-12 2013-01-25 00:27:39 +00:00
Colin Watson
41249ff41a Also skip update-grub when running in a container (LP: #1060404). 2013-01-22 14:31:10 +00:00
Colin Watson
1f73a30a3c Silence output from running-in-container. 2013-01-22 12:06:01 +00:00
Colin Watson
e530c3c0c2 releasing version 2.00-11 2013-01-21 12:53:58 +00:00
Colin Watson
f58e49e295 Adjust versions of grub-doc and grub-legacy-doc conflicts to tolerate
Ubuntu's backport of the grub-doc split (LP: #493968).
2013-01-21 10:47:30 +00:00
Colin Watson
3280ff94de Replace "single" with "recovery" when friendly-recovery is installed
(LP: #575469).
2013-01-21 10:39:27 +00:00
Colin Watson
3c93beb2a7 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.
2013-01-21 10:32:30 +00:00
Colin Watson
201aa719da * Merge from Ubuntu:
- If the postinst is running in a container, skip grub-install and all
    its associated questions (LP: #1060404).
2013-01-20 23:45:21 +00:00
Colin Watson
2413ea6267 initrd_addr_min.patch applied upstream 2013-01-20 23:06:39 +00:00
Colin Watson
f341b6cc4c * Merge wheezy branch up to 1.99-27, fixing overzealous removal of
load_video call when GRUB_GFXPAYLOAD_LINUX is empty (closes: #661789).
2013-01-20 23:05:08 +00:00
Colin Watson
99a70a6f18 releasing version 1.99-27 2013-01-20 17:17:05 +00:00
Colin Watson
a0004df020 Amend gfxpayload_keep_default.patch to no longer remove the call to
load_video when GRUB_GFXPAYLOAD_LINUX is empty (closes: #661789).
2013-01-20 16:37:10 +00:00
Adam Conrad
7a110bd08d debian/{postinst,config}.in: Don't fail if /etc/default/grub.d
configuration snippets exist, but /etc/default/grub does not.
2013-01-04 14:17:14 -07:00
Colin Watson
92b1137f35 releasing version 2.00-10 2013-01-03 11:01:16 +00:00
Colin Watson
b567babaa2 Blacklist 1440x900x32 from VBE preferred mode handling until a better
solution is available (LP: #701111).
2013-01-03 09:38:17 +00:00
Colin Watson
257ad9f328 Read /etc/default/grub.d/*.cfg after /etc/default/grub (LP: #901600). 2013-01-02 16:58:49 +00:00
Colin Watson
32783d0799 * Merge from Ubuntu:
- Don't permit loading modules on UEFI Secure Boot (since in such a
    setup the GRUB core image must be signed but it has no provision for
    verifying module signatures).
2013-01-02 16:52:59 +00:00
Colin Watson
5803499227 Build with GCC 4.7. 2013-01-02 16:38:46 +00:00
Colin Watson
dc91a29064 releasing version 1.99-26 2013-01-02 12:31:38 +00:00
Colin Watson
935d9370ac Remove /boot/grub/unicode.pf2 on purge of grub-efi-{amd64,i386} (closes:
#697183).
2013-01-02 11:53:57 +00:00
Colin Watson
d971277f76 Remove /boot/grub/unicode.pf2 on purge of grub-efi-{amd64,i386} (closes:
#697183).
2013-01-02 11:53:27 +00:00
Colin Watson
8fb8ec2ec0 Support parallel builds. 2013-01-02 10:17:56 +00:00
Colin Watson
f3fdeaebef releasing version 2.00-9 2012-12-30 01:01:41 +00:00
Colin Watson
03a0d72740 releasing version 1.99-25 2012-12-30 00:27:45 +00:00
Colin Watson
aa3ad21d31 Ensure /boot/grub exists before copying files to it for EFI installs
(closes: #696962).
2012-12-29 23:44:55 +00:00
Colin Watson
5c4103aeb1 Ensure /boot/grub exists before copying files to it for EFI installs
(closes: #696962).
2012-12-29 23:44:10 +00:00
Colin Watson
b954d9c142 releasing version 2.00-8 2012-12-29 00:38:56 +00:00
Colin Watson
9dfe18432a releasing version 1.99-24 2012-12-28 17:31:49 +00:00
Colin Watson
415fc9486b Fix grammar in Finnish translation (closes: #687681). 2012-12-28 12:59:44 +00:00
Colin Watson
48a8807ea4 Copy unicode.pf2 to /boot/grub/ for EFI installs so that it is more
likely to be readable by GRUB (closes: #661789).
2012-12-28 07:16:11 +00:00
Colin Watson
d448e0a4ad gnulib_gets.patch applied upstream 2012-12-28 07:13:58 +00:00
Colin Watson
31979b0e5a Fix infinite recursion in gettext when translation fails (closes:
#611537, #612454, #616487, #619618, #626853, #643608).
2012-12-28 05:50:32 +00:00
Colin Watson
8c73049fd8 Copy unicode.pf2 to /boot/grub/ for EFI installs so that it is more
likely to be readable by GRUB (closes: #661789).
2012-12-28 05:28:17 +00:00
Colin Watson
017c83132e * Acknowledge NMU with thanks.
* Fix namespace of EFI boot failure patch file added in NMU.
2012-12-28 05:18:15 +00:00
Colin Watson
5c7d370148 Avoid assuming that gets is declared. 2012-11-18 10:23:03 +00:00
Colin Watson
93df645831 Fix incorrect initrd minimum address calculation (LP: #1055686). 2012-11-18 10:21:46 +00:00
Colin Watson
0b94791fcb * Merge from Ubuntu:
- Ignore symlink traversal failures in grub-mount readdir
    (LP: #1051306).
2012-11-18 10:20:28 +00:00
Colin Watson
26cceb630a Move powerpc-ibm-utils and powerpc-utils dependencies from
grub-ieee1275-bin to grub-ieee1275 (closes: #693400).
2012-11-17 23:15:02 +00:00
Colin Watson
a0c04d6205 Drop grub-ieee1275-bin's dependency on bc in favour of powerpc-ibm-utils
(>= 1.2.12-1) (cf. #625728).
2012-11-16 23:31:47 +00:00
Michael Gilbert
489654c966 * Non-maintainer upload.
* Apply Ubuntu patch fixing some EFI boot failures (closes: #687320)
  - Thanks to Colin Watson.
2012-10-14 04:09:51 -04:00
Colin Watson
a9bc269208 Set a file encoding, per PEP 0263. 2012-09-27 13:27:58 +01:00
Colin Watson
425aceeb2f * debian/apport/source_grub2.py:
- Use context managers to avoid (harmless) file descriptor leaks.
2012-09-27 13:26:48 +01:00
Colin Watson
4cfaf5e2a9 releasing version 2.00-7 2012-09-26 17:05:50 +01:00
Colin Watson
f84028752c Avoid getting confused by inaccessible loop device backing paths
(LP: #938724).
2012-09-26 16:03:05 +01:00
Colin Watson
dc50034e02 bug reference 2012-09-26 16:02:05 +01:00
Colin Watson
4e99dc2a14 * Merge from Ubuntu:
- Prefer translations from language packs.  (No-op for Debian, but
    harmless.)
2012-09-26 15:58:40 +01:00
Colin Watson
227bfa7488 Fix tftp endianness problem. 2012-09-26 13:47:00 +01:00