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

1844 commits

This branch
This branch
All branches
Author SHA1 Message Date
phcoder
5ce5507f1c Merge branch 'mainline' into newconf 2009-07-16 16:37:18 +00:00
phcoder
ee293aee1b 2009-07-16 Vladimir Serbinenko <phcoder@gmail.com> 
Fix hang and segmentation fault in grub-emu-usb

	* disk/scsi.c (grub_scsi_open): return err and not grub_errno
	* util/usb.c (grub_libusb_devices): likewise
	(grub_libusb_init): rename to ...
	(GRUB_MOD_INIT (libusb)):...this
	(grub_libusb_fini): rename to ..
	(GRUB_MOD_FINI (libusb)):...this
	* disk/usbms.c (grub_usbms_transfer): fix retry logic
	* include/grub/disk.h (grub_raid_init): removed, it's useless
	(grub_raid_fini): likewise
	(grub_lvm_init): likewise
	(grub_lvm_fini): likewise
	* util/grub-emu.c (main): don't call grub_libusb_init, it's done
	by grub_init_all
 2009-07-16 15:36:43 +00:00
phcoder
94414221cf 2009-07-16 Vladimir Serbinenko <phcoder@gmail.com> 
Fix libusb

	* Makefile.in (LIBUSB): new macro
	* genmk.rb (Utility/print_tail): new method
	(Utility/rule): use intermediary variable #{prefix}_OBJECTS
	(top level): call util.print_tail at the end.
 2009-07-16 14:53:33 +00:00
phcoder
59ade63d27 2009-07-16 Vladimir Serbinenko <phcoder@gmail.com> 
Make FreeBSD accept zpool.cache

	* loader/i386/bsd.c (grub_freebsd_add_meta_module): spoof filename if
	type is /boot/zfs/zpool.cache
 2009-07-15 22:51:47 +00:00
phcoder
a58da8c77b 2009-07-16 Vladimir Serbinenko <phcoder@gmail.com> 
Fix 64-bit efiemu

	* include/grub/efiemu/efiemu.h (grub_efiemu_configuration_table64_t):
	correct wrong typedef
	* efiemu/prepare.c (SUFFIX (grub_efiemu_prepare)): minor style fixes
 2009-07-15 22:04:41 +00:00
proski
560ca572fa 2009-07-15 Pavel Roskin <proski@gnu.org> 
* include/grub/disk.h (struct grub_disk_dev): Use enum for id.
	* kern/disk.c (struct grub_disk_cache): Likewise.
 2009-07-15 19:45:44 +00:00
proski
e8e8e4fd88 2009-07-15 Pavel Roskin <proski@gnu.org> 
* commands/probe.c (options): Typo fix.
 2009-07-15 19:30:34 +00:00
proski
fde24e10a8 2009-07-15 Pavel Roskin <proski@gnu.org> 
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_BPB_END):
	Increase to 0x5a to accommodate FAT32.  Adjust other offsets
	accordingly.
	Original patch by Yves Blusseau <yves.grub-devel@zetam.org>
 2009-07-15 15:06:12 +00:00
proski
379c54c1b3 2009-07-15 Pavel Roskin <proski@gnu.org> 
* boot/i386/pc/boot.S (general_error_string): Add DOS newline at
	the end of "Error" to make the message more readable.
 2009-07-15 15:00:26 +00:00
proski
7bd8f5bfe1 2009-07-15 Pavel Roskin <proski@gnu.org> 
* boot/i386/pc/boot.S (kernel_segment): Remove.
	(copy_buffer): Use GRUB_BOOT_MACHINE_KERNEL_ADDR in segment 0
	for destination.
 2009-07-15 14:58:07 +00:00
proski
40b132c562 2009-07-15 Pavel Roskin <proski@gnu.org> 
* boot/i386/pc/boot.S (boot_version): Remove.
	* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_VER_MAJ):
	Remove.
 2009-07-15 14:55:24 +00:00
proski
2059157753 2009-07-15 Pavel Roskin <proski@gnu.org> 
* include/grub/i386/pc/boot.h: Sort all offsets.
	(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Remove, it's unused.
	(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Likewise.
	* boot/i386/pc/boot.S: Assert location of every offset listed in
	include/grub/i386/pc/boot.h.
 2009-07-15 14:54:18 +00:00
proski
44b5d87973 2009-07-13 Pavel Roskin <proski@gnu.org> 
* include/grub/i386/coreboot/machine.h: Rename
	GRUB_MACHINE_LINUXBIOS to GRUB_MACHINE_COREBOOT.
	* loader/multiboot_loader.c (grub_cmd_multiboot_loader): Allow
	multiboot 1 for GRUB_MACHINE_COREBOOT and GRUB_MACHINE_QEMU.
 2009-07-13 23:57:11 +00:00
proski
17dc3751c2 2009-07-13 Pavel Roskin <proski@gnu.org> 
* kern/dl.c: Force native word size to suppress warnings when
	compiling grub-emu.
 2009-07-13 23:04:31 +00:00
proski
2df32b2c4a 2009-07-13 Pavel Roskin <proski@gnu.org> 
* kern/device.c (grub_device_iterate): Change struct part_ent to
	hold the name, not a pointer to it.  Use one grub_malloc() per
	partition, not two.  Free partition_name if grub_malloc() fails.
	Set ents to NULL only before grub_partition_iterate() is called.
 2009-07-13 22:21:49 +00:00
bean
75c59f59e7 2009-07-11 Bean <bean123ch@gmail.com> 
* kern/ieee1275/openfw.c (grub_children_iterate): Fix size of
	childname.
 2009-07-11 03:59:15 +00:00
robertmh
0ae1bf88be 2009-07-10 Bean <bean123ch@gmail.com> 
2009-07-10  Robert Millan  <rmh.grub@aybabtu.com>

        * kern/ieee1275/openfw.c (grub_children_iterate)
        (grub_devalias_iterate): Fix size evaluation for property or path
        strings, which was broken since r2132.
 2009-07-10 20:19:08 +00:00
proski
7d8a52d3a2 2009-07-07 Pavel Roskin <proski@gnu.org> 
* commands/search.c (search_file): Merge into ...
	(search_fs): ... this.  Accept search type as argument.
	(grub_cmd_search): Pass search type to search_fs().
 2009-07-07 20:13:39 +00:00
proski
25f9a05a03 2009-07-07 Pavel Roskin <proski@gnu.org> 
* include/grub/util/console.h: New file.
	* util/console.c: Use it instead of grub/machine/console.h.
	* util/grub-emu.c: Likewise.
 2009-07-07 20:03:03 +00:00
proski
8279cade23 2009-07-07 Pavel Roskin <proski@gnu.org> 
* lib/arg.c (find_long_option): Remove.
	(find_long): Add `len' argument, make `s' const char *.
	(grub_arg_parse): Parse long options in place, not in a
	temporary buffer.
 2009-07-07 19:54:19 +00:00
proski
99f6804167 2009-07-06 Pavel Roskin <proski@gnu.org> 
* commands/search.c (search_fs): Fix potential NULL pointer
	dereference.
 2009-07-07 03:05:01 +00:00
proski
4a11b60f10 2009-07-06 Pavel Roskin <proski@gnu.org> 
* commands/search.c (search_fs): Replace QUID macro with quid_fn
	function pointer.
 2009-07-06 20:13:06 +00:00
proski
e110f4dea7 2009-07-06 Daniel Mierswa <impulze@impulze.org> 
* commands/search.c (search_fs): Use grub_strcasecmp() for UUID
	comparison.
 2009-07-06 20:07:58 +00:00
proski
bab7495862 2009-07-05 Pavel Roskin <proski@gnu.org> 
* include/grub/i386/linux.h (struct linux_kernel_params):
	Restore padding3, it's still needed.
 2009-07-06 02:10:57 +00:00
proski
46eeb6a264 2009-07-05 Pavel Roskin <proski@gnu.org> 
* util/grub.d/10_freebsd.in: Fix spelling of `device.hints' on
	FreeBSD.
	* util/osdetect.lua: Likewise.
 2009-07-05 22:51:05 +00:00
bean
b4a1dc7990 2009-07-05 Bean <bean123ch@gmail.com> 
* conf/common.rmk (lua_mode_SOURCES): Add script/lua/lstrlib.c.

	* script/lua/grub_lib.c (grub_lua_run): Check input parameter.
	(grub_lua_getenv): Likewise.
	(grub_lua_setenv): Likewise.
	(save_errno): New function.
	(push_result): Likewise.
	(grub_lua_enum_device): Likewise.
	(grub_lua_enum_file): Likewise.
	(grub_lua_file_open): Likewise.
	(grub_lua_file_close): Likewise.
	(grub_lua_file_seek): Likewise.
	(grub_lua_file_read): Likewise.
	(grub_lua_file_getline): Likewise.
	(grub_lua_file_getsize): Likewise.
	(grub_lua_file_getpos): Likewise.
	(grub_lua_file_eof): Likewise.
	(grub_lua_file_exist): Likewise.
	(grub_lua_add_menu): Likewise.

	* script/lua/grub_lua.h (isupper): New inline function.
	(islower): Likewise.
	(ispunct): Likewise.
	(isxdigit): Likewise.
	(strcspn): Change to normal function.
	(strpbkr): New function declaration.
	(memchr): Likewise.

	* script/lua/grub_main.c (scan_str): New function.
	(strcspn): Likewise.
	(strpbrk): Likewise.
	(memchr): Likewise.

	* script/lua/linit.c (lualibs): Enable the string library.

	* util/osdetect.lua: New file.
 2009-07-05 09:59:27 +00:00
robertmh
2da9229550 2009-07-04 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/i386/linux.h (struct linux_kernel_params): Add
        `capabilities' member.
 2009-07-04 16:29:01 +00:00
proski
b2582ec99c 2009-07-02 Pavel Roskin <proski@gnu.org> 
* genparttoollist.sh: Add missing newline at the end.
 2009-07-02 04:12:23 +00:00
proski
87a7339e7a 2009-07-01 Pavel Roskin <proski@gnu.org> 
* kern/x86_64/efi/callwrap.S: Add missing newline at the end.
 2009-07-02 00:21:07 +00:00
proski
d23af54ef4 2009-07-01 Pavel Roskin <proski@gnu.org> 
* util/hostdisk.c (open_device): Remove `const' from
	`sysctl_size', as sysctlbyname() can change it (in this case it
	doesn't actually happen).
 2009-07-01 23:58:30 +00:00
proski
c94b18a9e5 2009-07-01 Pavel Roskin <proski@gnu.org> 
* include/grub/types.h: Define GRUB_LONG_MAX and GRUB_LONG_MIN
	using signed long int constants.
 2009-07-01 23:38:40 +00:00
proski
c6cd3ef022 2009-07-01 Pavel Roskin <proski@gnu.org> 
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Make `p'
	constant to avoid a warning on FreeBSD.
 2009-07-01 23:07:17 +00:00
proski
0df634200a 2009-07-01 Pavel Roskin <proski@gnu.org> 
* util/hostdisk.c (device_is_wholedisk): Compile only on systems
	where it's needed.
 2009-07-01 22:56:51 +00:00
proski
999577f13c 2009-07-01 Pavel Roskin <proski@gnu.org> 
* Makefile.in: Install include/grub/machine symlink.
 2009-07-01 22:48:38 +00:00
proski
6f41557fb1 2009-07-01 Pavel Roskin <proski@gnu.org> 
* Makefile.in: When installing symlinks, use "cp -fR", which
	works on FreeBSD and MacOSX.
	From Yves Blusseau <cl7m42e02@sneakemail.com>
 2009-07-01 22:47:28 +00:00
proski
c8d229882a 2009-07-01 Pavel Roskin <proski@gnu.org> 
* kern/dl.c (grub_dl_resolve_symbol): Make static.
	* include/grub/dl.h: Remove grub_dl_resolve_symbol().
 2009-07-01 16:00:34 +00:00
proski
1b96e95249 2009-07-01 Pavel Roskin <proski@gnu.org> 
* util/misc.c: Move grub_reboot() and grub_halt() ...
	* util/grub-emu.c: ... here.  Make main_env static.
	* include/grub/util/misc.h: Remove main_env.
 2009-07-01 15:59:05 +00:00
proski
2ef0084d80 2009-07-01 Pavel Roskin <proski@gnu.org> 
* kern/mm.c: Use correct format to print size_t.
 2009-07-01 15:39:21 +00:00
proski
3262295617 2009-07-01 Pavel Roskin <proski@gnu.org> 
* include/grub/elf.h: Define Elf_Sword and Elf_Xword.
	* kern/i386/dl.c: Use ELF symbols without "32" or "64".
	* kern/powerpc/dl.c: Likewise.
	* kern/sparc64/dl.c: Likewise.
	* kern/x86_64/dl.c: Likewise.
 2009-07-01 14:49:22 +00:00
robertmh
3f7f0cd003 2009-07-01 Robert Millan <rmh.grub@aybabtu.com> 
Fix grub-emu build on sparc64-ieee1275.

        * conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Syncronize with ...
        * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): ... this.
 2009-07-01 13:04:38 +00:00
robertmh
211d06b54b 2009-07-01 Robert Millan <rmh.grub@aybabtu.com> 
* util/misc.c: Include `<setjmp.h>' and `<grub/machine/machine.h>'.
        (grub_reboot, grub_halt): New functions.

        * util/i386/pc/misc.c: Delete.  Update all users.
        * util/sparc64/ieee1275/misc.c: Likewise.
        * util/powerpc/ieee1275/misc.c: Likewise.
 2009-07-01 13:01:33 +00:00
robertmh
aaf53e3ce3 2009-07-01 Robert Millan <rmh.grub@aybabtu.com> 
* conf/i386.rmk (setjmp_mod_SOURCES)
        (setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): Move to ...
        * conf/common.rmk (setjmp_mod_SOURCES)
        (setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): ... here, and modify
        to use $(target_cpu).
        * conf/x86_64-efi.rmk (setjmp_mod_SOURCES)
        (setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): Remove.
        * conf/powerpc-ieee1275.rmk: Likewise.
        * conf/sparc64-ieee1275.rmk: Likewise.

        * conf/i386-pc.rmk (kernel_img_SOURCES): Use
        $(target_cpu) for kern/$(target_cpu)/dl.c.
        * conf/i386-efi.rmk: Likewise.
        * conf/i386-ieee1275.rmk: Likewise.
        * conf/x86_64-efi.rmk: Likewise.
        * conf/i386-coreboot.rmk: Likewise.
        * conf/powerpc-ieee1275.rmk (kernel_img_SOURCES): Use
        $(target_cpu) for kern/$(target_cpu)/dl.c and for
        kern/$(target_cpu)/cache.S.
        * conf/sparc64-ieee1275.rmk: Likewise.
 2009-07-01 12:59:47 +00:00
robertmh
a337130b25 2009-07-01 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/i386/linux.h (linux_kernel_params): Change `mmap_size'
        type to `grub_uint8_t', and adjust `padding9' accordingly.
 2009-07-01 01:04:12 +00:00
robertmh
b09db61ddd 2009-06-29 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): New macro.

        * loader/i386/linux.c [__i386__] (grub_linux_boot): Simplify inline
        assembly in final jump, using register constraints.

        (grub_linux_boot): For text mode, initialize `have_vga' using
        GRUB_VIDEO_TYPE_TEXT rather than 0 (this changes its value to 1).

        Initialize `video_cursor_x' and `video_cursor_y' as late as possible,
        right before the final jump.

        Set `video_mode' to 0x3.

        Document initialization of `video_page', `video_mode' and
        `video_ega_bx'.
 2009-06-29 17:19:35 +00:00
robertmh
c6fe4d5328 2009-06-29 Robert Millan <rmh.grub@aybabtu.com> 
* loader/i386/linux.c [__i386__] (grub_linux_boot): Simplify inline
        assembly in final jump, using register constraints.
 2009-06-29 15:55:42 +00:00
robertmh
28333ad04f 2009-06-29 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/i386/linux.h (GRUB_LINUX_FLAG_QUIET): New macro.
        * loader/i386/linux.c (grub_cmd_linux): Recognize "quiet" option,
        and set GRUB_LINUX_FLAG_QUIET appropiately.
 2009-06-29 12:20:56 +00:00
robertmh
02164e1bb7 2009-06-29 Robert Millan <rmh.grub@aybabtu.com> 
Fix build on Debian / sparc.

        * configure.ac: Recognize `sparc' target_cpu (as sparc64).
 2009-06-29 12:19:08 +00:00
proski
85f2aab6f7 2009-06-28 Pavel Roskin <proski@gnu.org> 
* kern/i386/qemu/mmap.c (grub_machine_mmap_iterate): Use cast to
	fix a warning.
 2009-06-29 03:37:42 +00:00
proski
18b6c557fd 2009-06-28 Pavel Roskin <proski@gnu.org> 
* util/grub.d/10_linux.in: Match SUSE style initrd names.
 2009-06-29 02:59:53 +00:00
robertmh
ad760f81b0 2009-06-27 Robert Millan <rmh.grub@aybabtu.com> 
* loader/i386/linux.c (grub_linux_boot): Fix uninitialized use of
        `err'.
 2009-06-27 17:37:07 +00:00