Colin Watson [Mon, 11 Apr 2011 13:47:10 +0000 (14:47 +0100)]
* Update branch_butter.patch:
- Fix filename comparison.
- Take extent offset in account on uncompressed extents.
- Use filled extent size if available.
Colin Watson [Sun, 10 Apr 2011 20:47:56 +0000 (21:47 +0100)]
* Update branch_fuse.patch:
- Make grub-mount exit non-zero if opening the device or filesystem
fails.
- Translate GRUB error codes into OS error codes for FUSE (LP: #756456).
Colin Watson [Fri, 25 Mar 2011 17:28:24 +0000 (17:28 +0000)]
Update branch_embed-sectors.patch, avoiding consuming lots of space and
time if the first partition is not near the start of the disk (closes:
#619458, LP: #691569).
Colin Watson [Fri, 25 Mar 2011 10:56:01 +0000 (10:56 +0000)]
Drop the default priority of grub2/linux_cmdline to medium. We only
need to ask it if we're upgrading from GRUB Legacy and found an empty
kopt in menu.lst (LP: #591202).
Colin Watson [Fri, 25 Mar 2011 10:51:08 +0000 (10:51 +0000)]
* Merge from Ubuntu:
- If we're upgrading and /boot/grub/core.img doesn't exist, then don't
ask where to install GRUB, since it probably means we're in some kind
of specialised environment such as a live USB stick (LP: #591202).
Colin Watson [Mon, 14 Mar 2011 16:23:04 +0000 (16:23 +0000)]
* Update ntldr-img from grub-extras:
- Only call ntfs_fix_mmft if the attribute to find is AT_DATA. This
matches GRUB's NTFS module.
- Install grubinst as grub-ntldr-img.
Colin Watson [Mon, 17 Jan 2011 13:42:47 +0000 (13:42 +0000)]
* 05_debian_theme:
- If we find a background image and no colours were specified, use
upstream defaults for color_normal and color_highlight rather than
setting color_normal to black/black.
- Don't try the other alternatives when $GRUB_BACKGROUND is set; you can
now add GRUB_BACKGROUND= to /etc/default/grub to force no background
image (closes: #608263).
Colin Watson [Mon, 17 Jan 2011 13:26:31 +0000 (13:26 +0000)]
* 05_debian_theme:
- If we find a background image and no colours were specified, use
upstream defaults for color_normal and color_highlight rather than
setting color_normal to black/black.
- Make the code more readable by replacing code for handling
alternatives.
- Make the code for searching for pictures in /boot/grub more readable
and robust (for example against newlines in the filename).
- Don't try the other alternatives when $GRUB_BACKGROUND is set; you can
now add GRUB_BACKGROUND= to /etc/default/grub to force no background
image (closes: #608263).
Colin Watson [Mon, 17 Jan 2011 12:29:40 +0000 (12:29 +0000)]
If 05_debian_theme finds a background image and no colours were
specified, then leave color_normal and color_highlight set to the
upstream default; previously we set the former to black text on a black
background, which was not very useful.
* conf/Makefile.common (STRIPFLAGS_KERNEL): Add -F elf32-i386 and
-R .drectve on cygwin.
* conf/i386-pc-cygwin-img-ld.sc: Merge rdata and pdata into data.
* configure.ac: Use $(top_builddir) in TARGET_OBJ2ELF.
(COND_CYGWIN): New condition.
* grub-core/Makefile.am (%.mod): Set TARGET_OBJ2ELF.
* grub-core/genmod.sh.in: Use ${TARGET_OBJ2ELF} and
not @TARGET_OBJ2ELF@.
* util/grub-pe2elf.c (write_symbol_table): Use pe_symtab->type and not
type to determine whether aux is to be used.
Colin Watson [Thu, 13 Jan 2011 00:01:38 +0000 (00:01 +0000)]
branch_butter.patch: Resolve the device returned by
grub_find_root_device_from_mountinfo or find_root_device_from_libzfs
using grub_find_device (closes: #609590, #609814, LP: #700147).
* util/ieee1275/ofpath.c (grub_util_devname_to_ofpath): Use the
realpath'ed device string.
Handle floppy (somewhat).
Issue error in unknown case rather than garbage.
Reported by: Axel Beckert.
* grub-core/loader/powerpc/ieee1275/linux.c (grub_linux_load32): Apply
loadmask before doing any calculations. Use correct type for offset.
(grub_linux_load64): Likewise.
Colin Watson [Tue, 11 Jan 2011 16:26:37 +0000 (16:26 +0000)]
* New Bazaar snapshot.
- Don't check amount of low memory, as reportedly INT 12h can be broken
and if low memory is too low we wouldn't have gotten into
grub_machine_init anyway (closes: #588293, LP: #513528).
- Submenu default support (LP: #691878).
- Fix optimisation-dependent grub-mklayout crash (closes: #609584).
* grub-core/loader/i386/linux.c (grub_linux_setup_video): Use
grub_video_get_driver_id and variable gfxpayloadforcelfb to
fill have_vga.
(grub_linux_boot): Rely on grub_linux_setup_video to fill have_vga and
shift params->lfb_size.
* include/grub/i386/linux.h: Make an enume out of have_vga values.
* grub-core/fs/zfs/zfsinfo.c (grub_cmd_zfs_bootfs): Use comma as
separator and pass bootpath/devid even if only one of them is available.
Reported by: Seth Goldberg.