Peter Jones
bae7fcc1ed
Fix incorrect assert failure reporting.
...
* grub-core/tests/example_functional_test.c (example_test): Add
a failure comment.
* grub-core/tests/lib/test.c (add_failure): Renamed to ...
(failure_start): ...this. Check that malloc succeeded.
Don't call xvasprintf. Return failure struct.
(failure_append_vtext): New function.
(failure_append_text): Likewise.
(add_failure): Likewise.
(grub_test_assert_helper): Likewise.
* include/grub/test.h (grub_test_assert_helper): New declaration.
(grub_test_assert): Macro rewritten.
2011-03-23 13:01:42 +01:00
Vladimir 'phcoder' Serbinenko
537dc9bec6
* grub-core/normal/main.c (GRUB_MOD_INIT): Export pager variable.
2011-03-23 12:40:15 +01:00
Vladimir 'phcoder' Serbinenko
fa3e01bfb5
* grub-core/lib/i386/pc/biosnum.c: Add missing include.
2011-03-23 12:23:42 +01:00
Vladimir 'phcoder' Serbinenko
b1d2840445
* grub-core/disk/usbms.c (grub_usbms_reset): Transform USB-style error
...
into GRUB-style one.
2011-03-23 12:21:15 +01:00
Vladimir 'phcoder' Serbinenko
e804e7b099
missing file in last change
2011-03-23 12:18:21 +01:00
Vladimir 'phcoder' Serbinenko
2e3e2e0908
* grub-core/bus/usb/usbtrans.c (grub_usb_control_msg): Return usb-style
...
error and not grub_errno.
* grub-core/bus/usb/usbhub.c (grub_usb_add_hub): Likewise.
2011-03-23 12:17:05 +01:00
Vladimir 'phcoder' Serbinenko
ed57e55702
* grub-core/bus/usb/uhci.c (grub_uhci_detect_dev): Return
...
GRUB_USB_SPEED_NONE in case of failure and not the error code.
2011-03-23 12:13:39 +01:00
Vladimir 'phcoder' Serbinenko
d1611f0163
* grub-core/efiemu/i386/pc/cfgtables.c
...
(grub_machine_efiemu_init_tables): Make declaration a prototype.
* grub-core/loader/xnu.c (grub_xnu_lock): Likewise.
(grub_xnu_unlock): Likewise.
* grub-core/normal/cmdline.c (grub_cmdline_get/cl_set_pos_all): Likewise.
2011-03-23 12:08:33 +01:00
Vladimir 'phcoder' Serbinenko
7d4e39d65a
* grub-core/bus/usb/usb.c (attach_hooks): Make static.
...
* grub-core/bus/usb/usbhub.c (hubs): Likewise.
* grub-core/commands/hashsum.c (aliases): Likewise.
* grub-core/commands/setpci.c (pci_registers): Likewise.
* grub-core/disk/usbms.c (attach_hook): Likewise.
* grub-core/fs/zfs/zfs.c (decomp_table): Likewise.
(zio_checksum_table): Likewise.
* grub-core/gettext/gettext.c (grub_gettext_msg_list): Likewise.
* grub-core/gfxmenu/gfxmenu.c (cached_view): Likewise.
* grub-core/lib/legacy_parse.c (legacy_commands): Likewise.
* grub-core/lib/relocator.c (leftovers): Likewise.
(extra_blocks): Likewise.
* grub-core/loader/i386/bsd.c (relocator): Likewise.
* grub-core/loader/i386/multiboot_mbi.c (modules): Likewise.
(modules_last): Likewise.
* grub-core/loader/i386/xnu.c (table_aliases): Likewise.
(devices): Likewise.
* grub-core/loader/multiboot_mbi2.c (modules): Likewise.
(modules_last): Likewise.
* grub-core/normal/auth.c (users): Likewise.
* grub-core/normal/context.c (initial_menu): Likewise.
(current_menu): Likewise.
* grub-core/normal/crypto.c (crypto_specs): Likewise.
* grub-core/term/serial.c (grub_serial_ports): Likewise.
(grub_serial_terminfo_input_template): Likewise.
(grub_serial_terminfo_output_template): Likewise.
(grub_serial_terminfo_input): Likewise.
(grub_serial_terminfo_output): Likewise.
(registered): Likewise.
* grub-core/term/usb_keyboard.c (attach_hook): Likewise.
2011-03-23 12:05:13 +01:00
Vladimir 'phcoder' Serbinenko
40fc46599d
* grub-core/video/bochs.c (grub_video_bochs_setup): Use
...
grub_video_mode_type_t.
* grub-core/video/cirrus.c (grub_video_cirrus_setup): Likewise.
* grub-core/video/i386/pc/vbe.c (grub_video_vbe_setup): Likewise.
* grub-core/video/i386/pc/vga.c (grub_video_vga_setup): Likewise.
2011-03-23 11:54:58 +01:00
Vladimir 'phcoder' Serbinenko
2da48d28d9
* util/grub-install.in: Correct the x86-64 name as x86_64.
2011-03-23 11:52:04 +01:00
Colin Watson
9b43bf396a
* grub-core/boot/i386/pc/lnxboot.S (real_code_2): Ensure that the
...
initial chunk read from the kernel always includes GRUB's multiboot
header, which is now outside the first sector.
2011-03-11 11:51:10 +00:00
Colin Watson
be1a7ce0cf
* grub-core/loader/i386/linux.c (find_efi_mmap_size): Page-align
...
cached mmap_size, so that this works correctly when called multiple
times.
Reported by: Daniel Kahn Gillmor. Should fix Debian bug #616638 .
2011-03-09 17:38:31 +00:00
Colin Watson
83a3c48d37
* docs/grub.texi (Simple configuration): Tidy up formatting.
2011-03-09 17:35:16 +00:00
Szymon Janc
57d75699d6
2011-03-07 Szymon Janc <szymon@janc.net.pl>
...
* grub-core/fs/zfs/zfs.c (zap_leaf_lookup):
Set-but-not-used variable removed.
2011-03-07 22:23:06 +01:00
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