Commit Graph

6737 Commits

Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
ef6de21af4 * grub-core/lib/relocator.c (allocate_inreg): Avoid dprintf unless
DEBUG_RELOCATOR is defined since gfxterm can't cope with output when
	malloc is disabled.
2011-03-24 12:39:48 +01:00
Colin Watson
a2969068fd * Cherry-pick from upstream:
- Fix crash when extending menu entry line beyond 79 characters (closes:
    #615893).
2011-03-24 11:38:07 +00:00
Vladimir 'phcoder' Serbinenko
8bc66a2ce6 * grub-core/loader/i386/bsdXX.c (grub_freebsd_load_elfmodule): Account
for modules headers when counting the needed allocation size.
2011-03-24 12:28:22 +01:00
Vladimir 'phcoder' Serbinenko
5657722c3c * grub-core/term/gfxterm.c (calculate_normal_character_width): Return 8
if no ASCII character is found to prevent crash.
2011-03-23 20:29:17 +01:00
Colin Watson
b6f5e9632f releasing version 1.99~rc1-5 2011-03-23 18:36:15 +00:00
Alexander Kurtz
41a85f5508 * grub-core/video/bitmap.c (match_extension): Ignore case. 2011-03-23 17:08:56 +01:00
Colin Watson
6adfc84f51 branch_butter.patch: adjust further for mountinfo_move_mounts.patch 2011-03-23 15:50:02 +00:00
Colin Watson
fd1e16c8ca Rewrite find_root_device_from_mountinfo to cope with move-mounts
(LP: #738345).
2011-03-23 15:36:31 +00:00
Colin Watson
ebad0b81be remove unused variable 2011-03-23 14:45:04 +00:00
Vladimir 'phcoder' Serbinenko
59e1e5f17b * grub-core/normal/menu_entry.c (init_line): Fix off-by-one error. 2011-03-23 14:18:56 +01:00
Vladimir 'phcoder' Serbinenko
bd4d051a95 * grub-core/script/parser.y: Declare "time" as valid argument. 2011-03-23 13:23:50 +01:00
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
2c4f9bf9b8 Mark binary packages as Multi-Arch: foreign (for example, an amd64
kernel installed on an i386 system could use the native architecture's
GRUB).
2011-03-22 11:24:22 +00:00
Colin Watson
f56115f7a0 Update debian/legacy/update-grub to the version from grub 0.97-65. 2011-03-22 11:24:02 +00:00
Colin Watson
0f66d2ebdb debconf-updatepo 2011-03-17 13:47:33 +00:00
Colin Watson
f1c0797a97 Thai (Theppitak Karoonboonyanan). Closes: #607706 2011-03-16 16:41:22 +00:00
Colin Watson
6c51da6ac5 Esperanto (Felipe Castro). Closes: #606524 2011-03-16 16:39:53 +00:00
Colin Watson
a2c0b45cae releasing version 1.99~rc1-4 2011-03-15 11:39:39 +00:00
Colin Watson
024e792575 really remove grub-ntldr-img from grub-common 2011-03-15 11:01:15 +00:00
Colin Watson
c196f44d5b Update branch_embed-sectors.patch to avoid straying into first partition
when embedding-area sectors are in use (closes: #613409, LP: #730225).
2011-03-14 22:07:17 +00:00
Colin Watson
745b77e362 Don't ship grub-ntldr-img in grub-common. 2011-03-14 17:27:29 +00:00
Colin Watson
1a42ef98c4 Fix loading GRUB from lnxboot (LP: #693671). 2011-03-14 16:25:23 +00:00
Colin Watson
4bc73bb9b1 * Update ntldr-img from grub-extras:
- Only call ntfs_fix_mmft if the attribute to find is AT_DATA.  This
    matches GRUB's NTFS module.
  - Install grubinst as grub-ntldr-img.
2011-03-14 16:23:04 +00:00
Colin Watson
69c3dd39df Update branch_devmapper.patch, adding partitioned MD RAID support
(untested) and support for probing multipath disks.
2011-03-14 10:03:15 +00: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
6c1c5bdc4f Don't touch /boot/grub/grub2-installed if using the --root-directory
option to grub-install (thanks, Nicolas George; closes: #614927).
2011-02-24 13:20:55 +00:00
Colin Watson
28f9509eb7 merge trunk 2011-02-17 14:51:11 +00:00
Colin Watson
d88e805584 releasing version 1.99~rc1-3 2011-02-16 14:55:45 +00:00
Colin Watson
28c4b981d9 * Update ntldr-img from grub-extras:
- Install g2hdr.bin and g2ldr.mbr (closes: #613245).
2011-02-14 14:45:38 +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
7bbc3aaab0 Adjust /etc/default/grub for rename of GRUB_DISABLE_LINUX_RECOVERY to
GRUB_DISABLE_RECOVERY (closes: #612777).
2011-02-10 17:17:07 +00:00
Colin Watson
77574e811a Tolerate camcontrol failing to read capacity of IDE devices, until such
time as we know how to do this properly (see #612128).
2011-02-09 13:29:08 +00:00
Colin Watson
769cd48fa4 We need at least freebsd-utils (>= 8.0-4) on kFreeBSD architectures for
camcontrol, so depend on it.
2011-02-09 13:04:05 +00:00
Colin Watson
b4f8124d6a Refer to the info documentation at the top of /etc/default/grub (closes:
#612538).
2011-02-09 12:56:55 +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