vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5004 commits 7 branches 0 tags 143 MiB
Commit graph

5004 commits

This branch
This branch
All branches
Author SHA1 Message Date
Colin Watson
28f9509eb7 merge trunk 2011-02-17 14:51:11 +00:00
Vladimir 'phcoder' Serbinenko
028501a0e0 Workaround yet another IEEE1275 bug. 
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New enum value
	GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS.
	* grub-core/kern/ieee1275/mmap.c (grub_machine_mmap_iterate): Ignore
	adress_cells and size:cells if GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS
	is set.
	* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
	GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS on powermacs.
 2011-02-12 10:22:55 +03:00
Vladimir 'phcoder' Serbinenko
d998657dcf * grub-core/partmap/msdos.c (pc_partition_map_embed): Fix off by one 
error.
 2011-02-12 09:59:04 +03:00
Colin Watson
fee7cdd4e1 * util/grub.d/20_linux_xen.in: Bail out early if linux_list is 
empty, since in that case we can only generate either nothing or a
syntactically invalid configuration file.
Reported by: Michal Suchanek.  Fixes Debian bug #612898.
 2011-02-11 13:00:54 +00:00
Colin Watson
97286eb547 * docs/grub.texi (Kernel): Add reference to grub-mkrescue. 
(Making a GRUB bootable CD-ROM): Likewise.
(Invoking grub-mkrescue): New section.
Reported by: Yann Dirson.  Fixes Debian bug #612585.
 2011-02-09 12:14:10 +00:00
Colin Watson
22b28eb3fe * util/grub-install.in: Remove unnecessary brackets from tr 
arguments.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
Reported by: Jamie Heilman.  Fixes Debian bug #612564.
 2011-02-09 11:23:11 +00:00
Colin Watson
7e735e4349 * include/grub/file.h (not_easly_seekable): Rename to ... 
(not_easily_seekable): ... this.  Update all users.
 2011-02-08 13:21:13 +00:00
Colin Watson
5870a4a06f typo 2011-02-04 16:35:07 +00:00
Colin Watson
8c2c4ff2f5 Handle empty dir passed to grub_find_root_device_from_mountinfo; fixes grub-mkrelpath on btrfs subvolumes. 2011-02-04 13:33:16 +00:00
Colin Watson
800f188183 * docs/grub.texi (Making a GRUB bootable CD-ROM): Update to describe 
grub-mkrescue.
 2011-01-28 17:01:28 +00:00
Vladimir 'phcoder' Serbinenko
3281d3d6d4 * util/grub-mkimage.c (generate_image): Refuse to create the images 
bigger than the actual flash (512K) in Loongson machines. 512K is also
	the biggest chip supported by them.
 2011-01-24 02:44:27 +01:00
Vladimir 'phcoder' Serbinenko
3533413cd5 * grub-core/kern/emu/getroot.c: Include config-util.h explicitly. 2011-01-22 15:37:05 +01:00
Vladimir 'phcoder' Serbinenko
73ae4f4ff5 Add missing ChangeLog entry 2011-01-22 15:30:48 +01:00
Anthony DeRobertis
5d4c5f8914 * grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Check 
super_offset field.
 2011-01-22 15:20:08 +01:00
Vladimir 'phcoder' Serbinenko
37f4f60828 * util/grub-install.in: Ignore install device on platforms 
where it doesn't make sense. Always use UUIDs except on pc, efi and
	sparc64.
	Reported by: Daniel Kahn Gillmor.
 2011-01-22 15:10:29 +01:00
Vladimir 'phcoder' Serbinenko
03a4ccb513 * grub-core/bus/bonito.c (write_bases): Fix direction of the shift. 2011-01-22 14:26:18 +01:00
Vladimir 'phcoder' Serbinenko
ffc8f4d8bc * grub-core/partmap/bsdlabel.c: Include grub/emu/misc.h and not grub/util/misc.h. 
(iterate_real): Don't rely on partition being non-NULL.
 2011-01-22 14:15:17 +01:00
Vladimir 'phcoder' Serbinenko
80f23be71f * grub-core/script/argv.c (round_up_exp): unsigned is 32-bit on all 
supported platforms. Put a compile time assert for this rather than
	generate a warning with 32-bit shift.
 2011-01-22 14:11:19 +01:00
Vladimir 'phcoder' Serbinenko
5d4f4dd51b * grub-core/disk/scsi.c (grub_scsi_read): Fix binary and check and make 
logical expression more readable.
 2011-01-22 13:22:46 +01:00
Vladimir 'phcoder' Serbinenko
e489601ad0 * grub-core/disk/raid.c (insert_array): Ensure uniqueness of p->number 
even if some elements have a name.
	Reported by: Alexander GQ Gerasiov.
 2011-01-22 13:18:05 +01:00
Colin Watson
96e0a6ea97 * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Consider a 
path unreadable if `grub-probe -t abstraction' fails, for example if
memberlist fails on an LVM volume group.
Reported by: Darius Jahandarie.
 2011-01-22 01:26:49 +00:00
Colin Watson
81431e2b02 * docs/grub.texi (Simple configuration): Document 
GRUB_PRELOAD_MODULES.
 2011-01-22 01:11:56 +00:00
Colin Watson
5e79d66a54 * .bzrignore: Remove nonexistent grub-pbkdf2. 2011-01-17 12:48:07 +00:00
Vladimir 'phcoder' Serbinenko
646ada34d1 * configure.ac: Bump version to 1.99~rc1. 2011-01-16 12:54:03 +01:00
Vladimir 'phcoder' Serbinenko
043603376e * util/grub-mkimage.c (generate_image): Check fwstart.img checksum 
for safety.
 2011-01-15 21:58:21 +01:00
Vladimir 'phcoder' Serbinenko
46c9db88cd * grub-core/kern/mips/yeeloong/init.c (grub_machine_init): Init boot 
module.
 2011-01-14 19:23:34 +01:00
Vladimir 'phcoder' Serbinenko
1d955d0098 * grub-core/Makefile.core.def (fwstart): Add lost LDFLAGS. 2011-01-14 19:21:06 +01:00
Vladimir 'phcoder' Serbinenko
4fbf185232 * grub-core/fs/zfs/zfsinfo.c (grub_cmd_zfs_bootfs): Quote bootpath and 
diskdevid.
 2011-01-13 22:25:56 +01:00
Vladimir 'phcoder' Serbinenko
f1632d4dd0 Fix compilation on cygwin. 
* 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.
 2011-01-13 22:23:49 +01:00
Colin Watson
bd1a414714 Resolve the device returned by grub_find_root_device_from_mountinfo or 
find_root_device_from_libzfs using grub_find_device.
Reported by: Roderich Schupp.
 2011-01-12 17:27:52 -06:00
Vladimir 'phcoder' Serbinenko
0b5e127b0d * 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.
 2011-01-12 19:58:32 +01:00
Vladimir 'phcoder' Serbinenko
173b71e9fe * util/grub.d/00_header.in (load_video): Handle the case when no video 
drivers available.
	Thanks to: Axel Beckert.
 2011-01-12 19:51:19 +01:00
Vladimir 'phcoder' Serbinenko
f8f479dbbb * util/grub-mkfont.c (write_font_pf2): Use appropriate type for data 
variable. Fixes problem on big endian platforms.
 2011-01-12 12:49:16 +01:00
Vladimir 'phcoder' Serbinenko
8fc0a24576 * grub-core/Makefile.core.def (ieee1275_fb): Disable on sparc. 
It doesn't work well there.
 2011-01-12 11:55:52 +01:00
Vladimir 'phcoder' Serbinenko
b8494fbe5c * grub-core/normal/context.c (grub_env_context_close): Silence spurious 
warning.
	* grub-core/normal/menu.c (grub_menu_execute_entry): Likewise.
	* grub-core/partmap/msdos.c (pc_partition_map_embed): Use unsigned
	counter.
 2011-01-12 11:52:51 +01:00
Vladimir 'phcoder' Serbinenko
b44a558c9a Use alias->path rather than buggy "canon". 
* grub-core/disk/ieee1275/ofdisk.c (ofdisk_hash_add_real): New function.
	(ofdisk_hash_add): New argument curcan. All users updated.
 2011-01-12 11:26:28 +01:00
Colin Watson
51fa856c58 * configure.ac: Fall back to true' if makeinfo' does not exist. 2011-01-11 17:49:27 -06:00
Vladimir 'phcoder' Serbinenko
9da068a5dc * 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.
 2011-01-11 23:01:07 +01:00
Colin Watson
6b978c4f04 merge trunk 2011-01-11 10:00:45 -06:00
Colin Watson
86205c94c3 * util/grub-mklayout.c (console_grub_equivalences_shift): Terminate 
with NULL.
(console_grub_equivalences_unshift): Likewise.
Reported by: Daniel Dehennin.
 2011-01-11 09:08:57 -06:00
Vladimir 'phcoder' Serbinenko
4531a206a1 * grub-core/fs/i386/pc/pxe.c (set_mac_env): Export variable. 
(set_env_limn_ro): Likewise.
	(GRUB_MOD_INIT): Likewise.
	* grub-core/hook/datehook.c (GRUB_MOD_INIT): Likewise. Change to
	ARRAY_SIZE while on it.
	(GRUB_MOD_FINI): Change to ARRAY_SIZE.
	* grub-core/normal/context.c (grub_env_export): Move from here ...
	* grub-core/kern/env.c (grub_env_export): ... here.
	* grub-core/normal/context.c (grub_cmd_export): Skip exporting root and
	prefix.
	* grub-core/kern/main.c (grub_main): Export root and prefix.
	* include/grub/env.h (grub_env_export): Export.
	Reported by: Seth Goldberg.
 2011-01-11 11:51:05 +01:00
Vladimir 'phcoder' Serbinenko
4514605726 * 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.
 2011-01-11 00:44:56 +01:00
Vladimir 'phcoder' Serbinenko
f093110b52 * BUGS: New file. 2011-01-11 00:06:01 +01:00
Vladimir 'phcoder' Serbinenko
3395fe5230 Pass more appropriate video id to Linux. 
* 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.
 2011-01-11 00:02:01 +01:00
Vladimir 'phcoder' Serbinenko
c2fa6cbb42 * util/grub-menulst2cfg.c: Add missing include of misc.h. 2011-01-10 23:57:49 +01:00
Vladimir 'phcoder' Serbinenko
b3ff6ff056 * 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.
 2011-01-10 23:56:11 +01:00
Vladimir 'phcoder' Serbinenko
ae67942e78 Don't use post-4G memory on EFI even if 64-bit since some non-compliant 
implementations bug on them.

	* grub-core/kern/efi/mm.c (grub_efi_allocate_pages): Skip post-4G
	memory.
	(filter_memory_map): Likewise.
 2011-01-10 23:51:10 +01:00
Vladimir 'phcoder' Serbinenko
d570097a04 * util/grub-kbdcomp.in: Add missing prefix and exec_prefix variables. 
Reported by: nebuchadnezzar.
 2011-01-10 23:41:58 +01:00
Vladimir 'phcoder' Serbinenko
a508e77642 * util/grub-kbdcomp.in: Add missing transform and bindir variables. 
Reported by: nebuchadnezzar.
 2011-01-10 23:31:27 +01:00
Vladimir 'phcoder' Serbinenko
dcb883b162 Submenu default support. 
* 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.
 2011-01-10 23:27:58 +01:00