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/multiboot_mbi.c (grub_multiboot_make_mbi):
Take into account space used by ELF sections and multiboot palette.
Reported by: Grégoire Sutre.
* 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.
* grub-core/normal/menu.c (grub_menu_execute_entry): New parameter
auto_boot. All users updated.
Declared static.
Handle chosen and default with submenus.
(grub_menu_execute_with_fallback): Declared static.
Don't notify failure if autobooted. Upper level does it.
(menuentry_eq): New function.
(get_entry_number): Use menuentry_eq.
(show_menu): New parameter "autobooted". All users updated.
(grub_show_menu): Likewise.
* include/grub/normal.h (grub_show_menu): Likewise.
* include/grub/menu.h (grub_menu_execute_entry): Removed.
(grub_menu_execute_with_fallback): Likewise.
* grub-core/kern/i386/pc/init.c (grub_get_conv_memsize): Removed.
(grub_machine_init): 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.
* grub-core/fs/zfs/zfs.c (dmu_read): Use void * for some pointers to
avoid aliasing.
(fzap_lookup): Likewise.
(dnode_get): Likewise.
(make_mdn): Likewise.
(zfs_mount): Likewise.
(fzap_iterate): Use temporary pointer to avoid aliasing.
(grub_zfs_read): Likewise.
* grub-core/loader/i386/xnu.c (grub_xnu_boot): Likewise.
* grub-core/loader/xnu.c (grub_cmd_xnu_kernel): Use void * for some
pointers to avoid aliasing.
(grub_cmd_xnu_kernel64): Likewise.
(grub_xnu_load_driver): Likewise.
Colin Watson [Thu, 6 Jan 2011 11:33:35 +0000 (11:33 +0000)]
* New Bazaar snapshot.
- Check that named RAID array devices exist before using them (closes:
#606035).
- Clear terminfo output on initialisation (closes: #569678).
- Fix grub-probe when btrfs is on / without a separate /boot.
Colin Watson [Thu, 6 Jan 2011 11:09:17 +0000 (11:09 +0000)]
* grub-core/kern/emu/getroot.c (find_root_device_from_mountinfo):
Fix prefix check to handle the case where dir ends with a slash
(most significantly, "/" itself).
Reported by: Michael Vogt.
Colin Watson [Wed, 5 Jan 2011 11:59:19 +0000 (11:59 +0000)]
When embedding the core image in a post-MBR gap, check for and avoid
sectors matching any of a number of known signatures, from the upstream
'embed-sectors' branch.