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

4969 commits

This branch
This branch
All branches
Author SHA1 Message Date
Colin Watson
b889cfadf9 * grub-core/fs/udf.c (read_string): Pacify GCC warning by 
initialising utf16.
 2010-12-21 13:00:10 +00:00
Colin Watson
4e01b6c821 * util/grub-mkconfig_lib.in (gettext_quoted): Add clarifying 
comment.  Add an extra layer of quotation, requiring the output of
this function to be used in a printf format string.
(gettext_printf): New function.
* util/grub.d/10_hurd.in: Use gettext_printf where appropriate.
Extract translatable strings from here-documents and use a temporary
variable instead, so that xgettext can find them.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.

* po/grub.d.sed: New file.
* po/Makefile.in.in ($(DOMAIN).pot-update): Extract gettext_printf
arguments.  Set c-format flags on all strings extracted from
util/grub.d/ (xgettext refuses to include these itself for strings
it extracted from a shell file, but these really are c-format).
 2010-12-21 12:49:29 +00:00
Vladimir 'phcoder' Serbinenko
5318fe9804 * grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_add_module): 
Avoid next pointing to nowhere.
 2010-12-20 16:13:01 +01:00
Vladimir 'phcoder' Serbinenko
6c85b743f5 * grub-core/fs/affs.c (grub_affs_mount): Read data->bblock.rootblock 
rather than assuming than rootblock is exactly in the middle.
	(grub_affs_label): Likewise.
 2010-12-19 00:52:18 +01:00
Vladimir 'phcoder' Serbinenko
a2a08a35bf * grub-core/fs/affs.c (grub_affs_fs) [GRUB_UTIL]: Explicitly set 
reserved_first_sector to 0.
	* grub-core/fs/cpio.c (grub_cpio_fs) [GRUB_UTIL]: Likewise.
	* grub-core/fs/sfs.c (grub_sfs_fs) [GRUB_UTIL]: Likewise.
	* grub-core/fs/xfs.c (grub_xfs_fs) [GRUB_UTIL]: Likewise.
 2010-12-19 00:49:52 +01:00
Vladimir 'phcoder' Serbinenko
7059d1ec14 Fix handling of UTF-16 UDF labels. 
* grub-core/fs/udf.c (grub_udf_iterate_dir): Move string-parsing part
	(read_string): .. here.
	(grub_udf_label): Use read_string.
 2010-12-19 00:43:41 +01:00
Vladimir 'phcoder' Serbinenko
5cf86f4b0f * util/grub-mkfont.c (main): Handle errors from FT_Set_Pixel_Sizes. 2010-12-18 22:47:50 +01:00
BVK Chaitanya
30aff4cb3a * grub-core/normal/menu_entry.c (run): Execute commands from menu 
editor under argument scope.
	Reported by: Jordan Uggla
 2010-12-19 09:55:51 +05:30
BVK Chaitanya
fcf983f8c7 merge with mainline 2010-12-19 09:17:22 +05:30
Colin Watson
32570200a8 * grub-core/normal/term.c (print_more): Make \r or \n scroll one 
line, and other keys scroll an entire page (previous handling was
for \r and \n to scroll a page and other keys to scroll two lines).
 2010-12-18 17:37:48 +00:00
Vladimir 'phcoder' Serbinenko
e1dffcf270 * grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi): 
Set ptrdest to correct get_physical_target_address rather than
	incorrect get_virtual_current_address.
 2010-12-18 14:31:05 +01:00
kashyap garimella
b04298cfa2 * grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_load): Use 
correct cat to grub_uint8_t * rather than grub_uint32_t *.
 2010-12-18 15:22:11 +01:00
Colin Watson
5367ecd305 * .bzrignore: Ignore grub-core/rs_decoder.S. 2010-12-10 12:56:45 +00:00
Colin Watson
1fb430f865 * grub-core/gettext/gettext.c (grub_gettext_init_ext): Factor out 
.mo/.mo.gz opening sequence to ...
(grub_mofile_open_lang): ... here.
(grub_gettext_init_ext): If opening ll_CC fails, try ll.
* util/grub.d/00_header.in (grub_lang): Include country part of
locale.
Reported by: Mario Limonciello.
 2010-12-10 11:45:08 +00:00
Robert Millan
a94a667185 2010-12-09 Robert Millan <rmh@gnu.org> 
* NEWS: Document addition of ZFS support.
 2010-12-09 14:09:37 +01:00
BVK Chaitanya
393324be7c execute menu editor commands with argument scope 2010-12-08 16:43:11 +05:30
Colin Watson
24b7938b32 * grub-core/kern/i386/pc/startup.S (grub_console_getkey): Use `>> 1' 
rather than `/ 2', as the latter requires -Wa,--divide which would
require bumping our minimum binutils version.
 2010-12-04 16:19:26 +00:00
BVK Chaitanya
bddc3ef623 * util/grub-script-check.c (main): Print script line number on 
error.
 2010-12-03 08:58:34 +05:30
BVK Chaitanya
c53c723762 print line number on error 2010-12-03 08:55:57 +05:30
Robert Millan
15abb5547f Merge ZFS. 2010-12-01 22:57:49 +01:00
Robert Millan
54207d4b6c Update GPL for ZFS code to version 3, move copyright lines for Vladimir and me to FSF (covered by our assignments) 2010-12-01 22:55:26 +01:00
Robert Millan
bf78d5b251 2010-12-01 Robert Millan <rmh@gnu.org> 
* grub-core/fs/zfs/zfs.c: New file.
	* grub-core/fs/zfs/zfs_fletcher.c: Likewise.
	* grub-core/fs/zfs/zfs_lzjb.c: Likewise.
	* grub-core/fs/zfs/zfs_sha256.c: Likewise.
	* grub-core/fs/zfs/zfsinfo.c: Likewise.
	
	* include/grub/zfs/dmu.h: Likewise.
	* include/grub/zfs/dmu_objset.h: Likewise.
	* include/grub/zfs/dnode.h: Likewise.
	* include/grub/zfs/dsl_dataset.h: Likewise.
	* include/grub/zfs/dsl_dir.h: Likewise.
	* include/grub/zfs/sa_impl.h: Likewise.
	* include/grub/zfs/spa.h: Likewise.
	* include/grub/zfs/uberblock_impl.h: Likewise.
	* include/grub/zfs/vdev_impl.h: Likewise.
	* include/grub/zfs/zap_impl.h: Likewise.
	* include/grub/zfs/zap_leaf.h: Likewise.
	* include/grub/zfs/zfs.h: Likewise.
	* include/grub/zfs/zfs_acl.h: Likewise.
	* include/grub/zfs/zfs_znode.h: Likewise.
	* include/grub/zfs/zil.h: Likewise.
	* include/grub/zfs/zio.h: Likewise.
	* include/grub/zfs/zio_checksum.h: Likewise.
	
	* Makefile.util.def: Build ZFS into libgrubmods.
	* grub-core/Makefile.core.def: Build zfs.mod.
 2010-12-01 22:42:11 +01:00
Colin Watson
ea20f6e03a merge some more commits from before Savannah compromise (mirrored by Launchpad) 2010-12-01 16:19:26 +00:00
Szymon Janc
3f0f38317b * grub-core/commands/regexp.c (grub_cmd_regexp): Remove unused 
variable.
	* grub-core/commands/wildcard.c (match_files): Likewise.
 2010-11-30 21:35:59 +01:00
Robert Millan
3a4253b2c4 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 19:33:12 +01:00
Colin Watson
725d286634 merge commits from before Savannah compromise 2010-11-30 17:01:52 +00:00
Robert Millan
c5c9cd3e7d Add missing include 2010-11-30 16:23:41 +01:00
Robert Millan
8c317b270f 2010-11-30 Robert Millan <rmh@gnu.org> 
* grub-core/commands/echo.c (grub_cmd_echo): Call grub_refresh()
	after printing a message.
 2010-11-30 15:36:47 +01:00
Vladimir 'phcoder' Serbinenko
49d3ab4668 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 22:29:19 +01:00
Vladimir 'phcoder' Serbinenko
f420a80458 * 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 22:03:16 +01:00
Robert Millan
4e7db17be9 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 15:35:40 +01:00
Colin Watson
9be57a0dad Fix LVM-on-RAID probing. 
* util/grub-probe.c (probe): Remember which disk was detected as
RAID (perhaps an LVM physical volume).  Use that disk's raidname
rather than that of the top-level disk.
 2010-11-26 12:26:37 +00:00
BVK Chaitanya
70b405d8f0 Fix cmdline argument quotes for setparams command of menuentry 
definitions.

	* grub-core/commands/menuentry.c (setparams_prefix): Use single
	quotes for arguments.
	* grub-core/lib/legacy_parse.c (grub_legacy_escape): Use
	grub_strchrsub function instead.

	* include/grub/misc.h (grub_strchrsub): New function.
 2010-11-25 19:59:10 +05:30
BVK Chaitanya
2c7859b36f merge with mainline 2010-11-25 19:54:50 +05:30
BVK Chaitanya
dfda224dd8 variable ordering 2010-11-25 19:07:02 +05:30
BVK Chaitanya
7955bea0d8 fix changelog and doc 2010-11-25 19:05:16 +05:30
BVK Chaitanya
5b08062083 replaced with grub_strchrsub function 2010-11-25 18:56:20 +05:30
BVK Chaitanya
d7647bb670 better changelog message 2010-11-25 18:25:26 +05:30
Colin Watson
74f72a6415 * util/deviceiter.c (grub_util_iterate_devices): Save a bit of 
effort by skipping "." and ".." entries up-front.
Suggested by: Michael Lazarev.
 2010-11-24 19:43:32 +00:00
Colin Watson
5a4072785b * grub-core/Makefile.core.def (xz_decompress): Move -lgcc from 
ldflags to ldadd, to fix link line ordering.
(none_decompress): Likewise.
 2010-11-24 19:32:49 +00:00
Colin Watson
3030d8ec49 * grub-core/Makefile.core.def (kernel): Add kern/emu/cache.S for emu 
platforms.
(grub-emu-lite): Remove kern/emu/cache.S.
 2010-11-24 12:07:14 +00:00
Colin Watson
b7fbac1214 * util/deviceiter.c (compare_devices): If the by-id link for a 
device couldn't be resolved, fall back to sorting by the by-id link
rather than segfaulting.
Reported and tested by: Daniel Mierswa.
 2010-11-23 17:42:06 +00:00
Colin Watson
5225f32882 * Makefile.util.def (grub-menulst2cfg): List libraries in ldadd, not 
ldflags, to fix link line ordering.
 2010-11-23 15:56:18 +00:00
Colin Watson
038b3ce8dc * grub-core/Makefile.am (gentrigtables): Put -lm after $<; some 
linkers are picky about this.
 2010-11-23 13:00:05 +00:00
Colin Watson
bf16e98e3c * grub-core/Makefile.am (command.lst): Adjust sed expression 
ordering so that extended and priority commands aren't treated as
ordinary commands.
 2010-11-23 12:52:40 +00:00
Colin Watson
7242bab6a4 * include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_BIOS_BOOT): 
Remove byte-swapping function calls, which are not valid in
structure initialisers.
* grub-core/partmap/gpt.c (grub_gpt_partition_type_bios_boot): Make
non-const.
(GRUB_MOD_INIT): Byte-swap data1, data2, and data3 fields of
grub_gpt_partition_type_bios_boot.
 2010-11-23 10:48:46 +00:00
Colin Watson
14e8b279e9 Fix test program build on GNU/kFreeBSD. 
* Makefile.util.def (example_unit_test): Add `$(LIBZFS)
$(LIBNVPAIR)' library dependencies.
 2010-11-22 18:22:50 +00:00
Colin Watson
e6f63338f7 usual e-mail address 2010-11-22 18:22:00 +00:00
Colin Watson
03df09c7c8 * util/grub-install.in: Fix parsing of --grub-mkrelpath= option. 2010-11-22 13:57:16 +00:00
Colin Watson
cf8ffc3825 * util/grub-install.in: Remove excessive quoting that broke 
installations to RAID devices.
 2010-11-22 12:20:57 +00:00