From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 1 Dec 2010 16:19:26 +0000 (+0000)
Subject: merge some more commits from before Savannah compromise (mirrored by Launchpad)
X-Git-Tag: 1.99~302
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea20f6e03a4e5c890492731782901e57390c309f;p=thirdparty%2Fgrub.git

merge some more commits from before Savannah compromise (mirrored by Launchpad)
---

ea20f6e03a4e5c890492731782901e57390c309f
diff --cc ChangeLog
index 4effc2ff4,8627ccc79..6dc1a627d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,28 +1,47 @@@
 +2010-11-30  Szymon Janc <szymon@janc.net.pl>
 +
 +	* grub-core/commands/regexp.c (grub_cmd_regexp): Remove unused
 +	variable.
 +	* grub-core/commands/wildcard.c (match_files): Likewise.
 +
 +2010-11-30  Robert Millan  <rmh@gnu.org>
 +
 +	* grub-core/loader/i386/bsd.c
 +	(grub_cmd_freebsd_loadenv, grub_cmd_freebsd_module_elf): Check
 +	whether kernel is loaded using grub_loader_is_loaded(), rather
 +	than `kernel_type', which may still be `KERNEL_TYPE_NONE' under
 +	certain error conditions.
 +
 +2010-11-30  Robert Millan  <rmh@gnu.org>
 +
 +	* grub-core/commands/echo.c: Include `<grub/term.h>'.
 +	(grub_cmd_echo): Call grub_refresh() after printing a message.
 +
+ 2010-11-26  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	Avoid using tricks for initialising endian variables.
+ 
+ 	* grub-core/partmap/gpt.c (grub_gpt_partition_type_bios_boot):
+ 	Make const.
+ 	(GRUB_MOD_INIT): Don't byte-swap.
+ 	* include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_BIOS_BOOT):
+ 	Use grub_cpu_to_le16_compile_time and grub_cpu_to_le32_compile_time.
+ 	* include/grub/types.h (grub_swap_bytes16_compile_time): New macro.
+ 	(grub_swap_bytes32_compile_time): Likewise.
+ 	(grub_cpu_to_le32_compile_time): Likewise.
+ 	(grub_cpu_to_le16_compile_time): Likewise.
+ 
+ 2010-11-26  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* util/grub-setup.c (setup): Stop recommending --force. People who
+ 	understand the dangers of blocklists are able to find this option
+ 	anyway and the ones who don't shouldn't use it anyway.
+ 
+ 2010-11-26  Robert Millan  <rmh@gnu.org>
+ 
+ 	* grub-core/term/i386/pc/vga_text.c (VGA_TEXT_SCREEN): Beautify.
+ 	Update all users.
+ 
  2010-11-26  Colin Watson  <cjwatson@ubuntu.com>
  
  	Fix LVM-on-RAID probing.