vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge mainline into luks

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-25 17:04:27 +02:00
commit 8c767fd198
30 changed files with 143 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
ChangeLog
View file

@ -1,3 +1,71 @@
2011-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c (grub_linux_boot): Supply target rather
than source address for efi mmap buffer.
2011-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/amiga.c (amiga_partition_map_iterate): Fix a
wrong action on non-detecting the magic.
2011-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/gnulib/regex.c: Remove GRUB_MOD_LICENSE since it's
already supplied by another part of the module (fixes compilation on
FreeBSD).
2011-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Make mdraid UUID
match the one used by mdadm.
2011-04-21 Colin Watson <cjwatson@ubuntu.com>
* po/README: Add instructions for creating po/LINGUAS.
2011-04-21 Colin Watson <cjwatson@ubuntu.com>
Add "SEE ALSO" sections to most man pages. Fixes Debian bug
#551428.
* docs/man/grub-editenv.h2m (SEE ALSO): New section.
* docs/man/grub-emu.h2m (SEE ALSO): Likewise.
* docs/man/grub-fstest.h2m (SEE ALSO): Likewise.
* docs/man/grub-install.h2m (SEE ALSO): Likewise.
* docs/man/grub-macho2img.h2m (SEE ALSO): Likewise.
* docs/man/grub-menulst2cfg.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkconfig.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkdevicemap.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkfont.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkimage.h2m (SEE ALSO): Likewise.
* docs/man/grub-mklayout.h2m (SEE ALSO): Likewise.
* docs/man/grub-mknetdir.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkpasswd-pbkdf2.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkrelpath.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkrescue.h2m (SEE ALSO): Likewise.
* docs/man/grub-ofpathname.h2m (SEE ALSO): Likewise.
* docs/man/grub-pe2elf.h2m (SEE ALSO): Likewise.
* docs/man/grub-probe.h2m (SEE ALSO): Likewise.
* docs/man/grub-reboot.h2m (SEE ALSO): Likewise.
* docs/man/grub-script-check.h2m (SEE ALSO): Likewise.
* docs/man/grub-set-default.h2m (SEE ALSO): Likewise.
* docs/man/grub-setup.h2m (SEE ALSO): Likewise.
2011-04-21 Colin Watson <cjwatson@ubuntu.com>
* grub-core/kern/emu/getroot.c
(grub_find_root_device_from_mountinfo): Remove non-virtual-device
test that was incorrectly reintroduced in r3214.
Reported by: Ian Dall. Fixes Savannah bug #33133.
2011-04-21 Colin Watson <cjwatson@ubuntu.com>
Fix stack pointer handling in 16-bit relocator.
* grub-core/lib/i386/relocator16.S (grub_relocator16_start): Move
grub_relocator16_sp to %esp rather than %ss, and zero-extend it.
Fixes Ubuntu bug #683904.
2011-04-20 Vladimir Serbinenko <phcoder@gmail.com> 2011-04-20 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Bump version to 1.99~rc2. * configure.ac: Bump version to 1.99~rc2.

3
docs/man/grub-editenv.h2m
View file

@ -1,2 +1,5 @@
[NAME] [NAME]
grub-editenv \- edit GRUB environment block grub-editenv \- edit GRUB environment block
[SEE ALSO]
.BR grub-reboot (8),
.BR grub-set-default (8)

4
docs/man/grub-emu.h2m
View file

@ -1,2 +1,6 @@
[NAME] [NAME]
grub-emu \- GRUB emulator grub-emu \- GRUB emulator
[SEE ALSO]
If you are trying to install GRUB, then you should use
.BR grub-install (8)
rather than this program.

2
docs/man/grub-fstest.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-fstest \- debug tool for GRUB filesystem drivers grub-fstest \- debug tool for GRUB filesystem drivers
[SEE ALSO]
.BR grub-probe (8)

5
docs/man/grub-install.h2m
View file

@ -1,2 +1,7 @@
[NAME] [NAME]
grub-install \- install GRUB to a device grub-install \- install GRUB to a device
[SEE ALSO]
.BR grub-mkconfig (8),
.BR grub-mkimage (1),
.BR grub-setup (8),
.BR grub-mkrescue (1)

2
docs/man/grub-macho2img.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-macho2img \- convert Mach-O to raw image grub-macho2img \- convert Mach-O to raw image
[SEE ALSO]
.BR grub-mkimage (1)

3
docs/man/grub-menulst2cfg.h2m
View file

@ -1,3 +1,4 @@
[NAME] [NAME]
grub-menulst2cfg \- transform legacy menu.lst into grub.cfg grub-menulst2cfg \- transform legacy menu.lst into grub.cfg
[SEE ALSO]
.BR grub-mkconfig (8)

2
docs/man/grub-mkconfig.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mkconfig \- generate a GRUB configuration file grub-mkconfig \- generate a GRUB configuration file
[SEE ALSO]
.BR grub-install (8)

2
docs/man/grub-mkdevicemap.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mkdevicemap \- generate a GRUB device map file automatically grub-mkdevicemap \- generate a GRUB device map file automatically
[SEE ALSO]
.BR grub-install (8)

2
docs/man/grub-mkfont.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mkfont \- make GRUB font files grub-mkfont \- make GRUB font files
[SEE ALSO]
.BR grub-mkconfig (8)

5
docs/man/grub-mkimage.h2m
View file

@ -1,2 +1,7 @@
[NAME] [NAME]
grub-mkimage \- make a bootable image of GRUB grub-mkimage \- make a bootable image of GRUB
[SEE ALSO]
.BR grub-install (8),
.BR grub-setup (8),
.BR grub-mkrescue (1),
.BR grub-mknetdir (8)

2
docs/man/grub-mklayout.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mklayout \- generate a GRUB keyboard layout file grub-mklayout \- generate a GRUB keyboard layout file
[SEE ALSO]
.BR grub-mkconfig (8)

2
docs/man/grub-mknetdir.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mknetdir \- prepare a GRUB netboot directory. grub-mknetdir \- prepare a GRUB netboot directory.
[SEE ALSO]
.BR grub-mkimage (1)

2
docs/man/grub-mkpasswd-pbkdf2.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB
[SEE ALSO]
.BR grub-mkconfig (8)

2
docs/man/grub-mkrelpath.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mkrelpath \- make a system path relative to its root grub-mkrelpath \- make a system path relative to its root
[SEE ALSO]
.BR grub-probe (8)

2
docs/man/grub-mkrescue.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-mkrescue \- make a GRUB rescue image grub-mkrescue \- make a GRUB rescue image
[SEE ALSO]
.BR grub-mkimage (1)

2
docs/man/grub-ofpathname.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-ofpathname \- find OpenBOOT path for a device grub-ofpathname \- find OpenBOOT path for a device
[SEE ALSO]
.BR grub-probe (8)

2
docs/man/grub-pe2elf.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-pe2elf \- convert PE image to ELF grub-pe2elf \- convert PE image to ELF
[SEE ALSO]
.BR grub-mkimage (1)

2
docs/man/grub-probe.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-probe \- probe device information for GRUB grub-probe \- probe device information for GRUB
[SEE ALSO]
.BR grub-fstest (1)

3
docs/man/grub-reboot.h2m
View file

@ -1,2 +1,5 @@
[NAME] [NAME]
grub-reboot \- set the default boot entry for GRUB, for the next boot only grub-reboot \- set the default boot entry for GRUB, for the next boot only
[SEE ALSO]
.BR grub-set-default (8),
.BR grub-editenv (1)

2
docs/man/grub-script-check.h2m
View file

@ -1,2 +1,4 @@
[NAME] [NAME]
grub-script-check \- check grub.cfg for syntax errors grub-script-check \- check grub.cfg for syntax errors
[SEE ALSO]
.BR grub-mkconfig (8)

3
docs/man/grub-set-default.h2m
View file

@ -1,2 +1,5 @@
[NAME] [NAME]
grub-set-default \- set the saved default boot entry for GRUB grub-set-default \- set the saved default boot entry for GRUB
[SEE ALSO]
.BR grub-reboot (8),
.BR grub-editenv (1)

4
docs/man/grub-setup.h2m
View file

@ -1,2 +1,6 @@
[NAME] [NAME]
grub-setup \- set up a device to boot using GRUB grub-setup \- set up a device to boot using GRUB
[SEE ALSO]
.BR grub-install (8),
.BR grub-mkimage (1),
.BR grub-mkrescue (1)

8
grub-core/disk/mdraid_linux.c
View file

@ -221,10 +221,10 @@ grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array,
return grub_errno; return grub_errno;
uuid = (grub_uint32_t *) array->uuid; uuid = (grub_uint32_t *) array->uuid;
uuid[0] = sb.set_uuid0; uuid[0] = grub_swap_bytes32 (sb.set_uuid0);
uuid[1] = sb.set_uuid1; uuid[1] = grub_swap_bytes32 (sb.set_uuid1);
uuid[2] = sb.set_uuid2; uuid[2] = grub_swap_bytes32 (sb.set_uuid2);
uuid[3] = sb.set_uuid3; uuid[3] = grub_swap_bytes32 (sb.set_uuid3);
*start_sector = 0; *start_sector = 0;

3
grub-core/gnulib/regex.c
View file

@ -19,9 +19,6 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <config.h> #include <config.h>
#include <grub/dl.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* Make sure noone compiles this code with a C++ compiler. */ /* Make sure noone compiles this code with a C++ compiler. */
#if defined __cplusplus && defined _LIBC #if defined __cplusplus && defined _LIBC

3
grub-core/kern/emu/getroot.c
View file

@ -221,9 +221,6 @@ grub_find_root_device_from_mountinfo (const char *dir, char **relroot)
/* Now scan visible mounts for the ones we're interested in. */ /* Now scan visible mounts for the ones we're interested in. */
for (i = entry_len - 1; i >= 0; i--) for (i = entry_len - 1; i >= 0; i--)
{ {
if (entries[i].major != 0)
continue; /* not a virtual device */
if (!*entries[i].device) if (!*entries[i].device)
continue; continue;

2
grub-core/lib/i386/relocator16.S
View file

@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss)
.byte 0xb8 .byte 0xb8
VARIABLE(grub_relocator16_sp) VARIABLE(grub_relocator16_sp)
.word 0 .word 0
movw %ax, %ss movzwl %ax, %esp
/* movw imm32, %edx. */ /* movw imm32, %edx. */
.byte 0x66, 0xba .byte 0x66, 0xba

10
grub-core/loader/i386/linux.c
View file

@ -549,6 +549,7 @@ grub_linux_boot (void)
#ifdef GRUB_MACHINE_EFI #ifdef GRUB_MACHINE_EFI
{ {
grub_efi_uintn_t efi_desc_size; grub_efi_uintn_t efi_desc_size;
grub_size_t efi_mmap_target;
grub_efi_uint32_t efi_desc_version; grub_efi_uint32_t efi_desc_version;
err = grub_efi_finish_boot_services (&efi_mmap_size, efi_mmap_buf, NULL, err = grub_efi_finish_boot_services (&efi_mmap_size, efi_mmap_buf, NULL,
&efi_desc_size, &efi_desc_version); &efi_desc_size, &efi_desc_version);
@ -556,23 +557,24 @@ grub_linux_boot (void)
return err; return err;
/* Note that no boot services are available from here. */ /* Note that no boot services are available from here. */
efi_mmap_target = real_mode_target
+ ((grub_uint8_t *) efi_mmap_buf - (grub_uint8_t *) real_mode_mem);
/* Pass EFI parameters. */ /* Pass EFI parameters. */
if (grub_le_to_cpu16 (params->version) >= 0x0206) if (grub_le_to_cpu16 (params->version) >= 0x0206)
{ {
params->v0206.efi_mem_desc_size = efi_desc_size; params->v0206.efi_mem_desc_size = efi_desc_size;
params->v0206.efi_mem_desc_version = efi_desc_version; params->v0206.efi_mem_desc_version = efi_desc_version;
params->v0206.efi_mmap = (grub_uint32_t) (unsigned long) efi_mmap_buf; params->v0206.efi_mmap = efi_mmap_target;
params->v0206.efi_mmap_size = efi_mmap_size; params->v0206.efi_mmap_size = efi_mmap_size;
#ifdef __x86_64__ #ifdef __x86_64__
params->v0206.efi_mmap_hi = (grub_uint32_t) ((grub_uint64_t) efi_mmap_buf >> 32); params->v0206.efi_mmap_hi = (efi_mmap_target >> 32);
#endif #endif
} }
else if (grub_le_to_cpu16 (params->version) >= 0x0204) else if (grub_le_to_cpu16 (params->version) >= 0x0204)
{ {
params->v0204.efi_mem_desc_size = efi_desc_size; params->v0204.efi_mem_desc_size = efi_desc_size;
params->v0204.efi_mem_desc_version = efi_desc_version; params->v0204.efi_mem_desc_version = efi_desc_version;
params->v0204.efi_mmap = (grub_uint32_t) (unsigned long) efi_mmap_buf; params->v0204.efi_mmap = efi_mmap_target;
params->v0204.efi_mmap_size = efi_mmap_size; params->v0204.efi_mmap_size = efi_mmap_size;
} }
} }

5
grub-core/partmap/amiga.c
View file

@ -114,8 +114,9 @@ amiga_partition_map_iterate (grub_disk_t disk,
return grub_errno; return grub_errno;
if (grub_memcmp (apart.magic, GRUB_AMIGA_PART_MAGIC, if (grub_memcmp (apart.magic, GRUB_AMIGA_PART_MAGIC,
sizeof (apart.magic)) == 0) sizeof (apart.magic)) != 0)
return grub_error (GRUB_ERR_BAD_PART_TABLE,
"invalid Amiga partition map");
/* Calculate the first block and the size of the partition. */ /* Calculate the first block and the size of the partition. */
part.start = (grub_be_to_cpu32 (apart.lowcyl) part.start = (grub_be_to_cpu32 (apart.lowcyl)
* grub_be_to_cpu32 (apart.heads) * grub_be_to_cpu32 (apart.heads)

4
po/README
View file

@ -8,6 +8,10 @@ that will hopefully clarify the situation.
rsync -Lrtvz translationproject.org::tp/latest/grub/ po rsync -Lrtvz translationproject.org::tp/latest/grub/ po
Then create a po/LINGUAS file listing all the language codes:
(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
GRUB's build system will automatically detect those and include them GRUB's build system will automatically detect those and include them
in your install. in your install.