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

1499 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
robertmh
87a4623bda 2009-06-27 Robert Millan <rmh.grub@aybabtu.com> 
Revert r2338.

        * loader/i386/linux.c (grub_cmd_linux): Don't call grub_error when
        file can't be opened.  grub_file_open() is already supposed to set
        grub_errno / grub_errmsg appropiately.
        * loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
 2009-06-27 12:21:18 +00:00
robertmh
8231fb77c6 2009-06-27 Pavel Roskin <proski@gnu.org> 
2009-06-27  Robert Millan  <rmh.grub@aybabtu.com>

        * include/grub/dl.h: Include grub/elf.h.
        (struct grub_dl): Add symtab field.
        * kern/dl.c [GRUB_MACHINE_QEMU]: Define
        GRUB_MODULES_MACHINE_READONLY.
        (grub_dl_resolve_symbols): Populate mod->symtab, making a copy
        of the header for read-only modules.
        (grub_dl_unload): Free mod->symtab for read-only modules.
        * kern/i386/dl.c: Use mod->symtab.
        * kern/powerpc/dl.c: Likewise.
        * kern/sparc64/dl.c: Likewise.
        * kern/x86_64/dl.c: Likewise.

        * conf/i386-qemu.rmk: New file.
        * kern/i386/qemu/startup.S: Likewise.
        * kern/i386/qemu/mmap.c: Likewise.
        * boot/i386/qemu/boot.S: Likewise.
        * include/grub/i386/qemu/time.h: Likewise.
        * include/grub/i386/qemu/serial.h: Likewise.
        * include/grub/i386/qemu/kernel.h: Likewise.
        * include/grub/i386/qemu/console.h: Likewise.
        * include/grub/i386/qemu/boot.h: Likewise.
        * include/grub/i386/qemu/init.h: Likewise.
        * include/grub/i386/qemu/machine.h: Likewise.
        * include/grub/i386/qemu/loader.h: Likewise.
        * include/grub/i386/qemu/memory.h: Likewise.

        * conf/i386-coreboot.rmk (GRUB_BOOT_MACHINE_LINK_ADDR)
        (GRUB_KERNEL_MACHINE_LINK_ADDR): New variables.
        [qemu] (pkglib_IMAGES): Add `boot.img'.
        [qemu] (boot_img_SOURCES, boot_img_ASFLAGS, boot_img_LDFLAGS)
        [qemu] (boot_img_FORMAT): New variables.
        [qemu] (bin_UTILITIES): Add `grub-mkimage'.
        [qemu] (grub_mkimage_SOURCES, grub_mkimage_CFLAGS): New variables.
        [qemu] (kernel_img_SOURCES, kernel_img_HEADERS, kernel_img_CFLAGS)
        [qemu] (kernel_img_ASFLAGS, kernel_img_LDFLAGS)
        [qemu] (kernel_img_FORMAT): New variables.

        * configure.ac: Recognise `i386-qemu'.

        * util/i386/pc/grub-mkimage.c (compress_kernel): Add dummy variant
        (for no compression).
        [GRUB_MACHINE_QEMU] (generate_image): Misc adjustments to produce
        a valid i386 ROM image.  Make `GRUB_KERNEL_MACHINE_COMPRESSED_SIZE',
        `GRUB_KERNEL_MACHINE_INSTALL_DOS_PART' and
        `GRUB_KERNEL_MACHINE_INSTALL_BSD_PART' optional features (with
        ifdefs).
 2009-06-27 11:18:10 +00:00
proski
97fe384ecb 2009-06-27 Pavel Roskin <proski@gnu.org> 
* efiemu/prepare.c: Eliminate TYPE macro, it makes code hard to
	read.
	* efiemu/prepare32.c: Likewise.
	* efiemu/prepare64.c: Likewise.
 2009-06-27 06:10:33 +00:00
proski
c402ab1734 2009-06-26 Pavel Roskin <proski@gnu.org> 
* include/grub/types.h: Define GRUB_TARGET_WORDSIZE.
	* include/grub/elf.h: Define symbols without "32" or "64" based
	on GRUB_TARGET_WORDSIZE.
	* include/grub/multiboot2.h: Use GRUB_TARGET_WORDSIZE.
	* efiemu/loadcore32.c: Redefine GRUB_TARGET_WORDSIZE, remove own
	ELF definitions.
	* efiemu/loadcore64.c: Likewise.
	* loader/i386/bsd32.c: Likewise.
	* loader/i386/bsd64.c: Likewise.
	* kern/dl.c: Remove own ELF definitions.
	* util/i386/efi/grub-mkimage.c: Likewise.
 2009-06-27 03:01:42 +00:00
robertmh
9bbdfd4d3b 2009-06-23 Robert Millan <rmh.grub@aybabtu.com> 
* kern/i386/pc/startup.S (real_to_prot): Access `gdtdesc' using
        segment 0x0 unconditionally, because the reference generated by
        GAS is an absolute address.
 2009-06-22 22:48:20 +00:00
robertmh
a42ce6e962 2009-06-22 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/i386/kernel.h: Include `<grub/machine/machine.h>'.
        [! GRUB_MACHINE_IEEE1275]: Set `GRUB_MOD_ALIGN' to 0x1.
 2009-06-22 20:40:28 +00:00
robertmh
cc3752ad73 (search_file): Improve error message. 
(GRUB_MOD_INIT(search)): Add missing `-n' to help output.
 2009-06-22 20:19:13 +00:00
robertmh
c952cf92a1 2009-06-22 Robert Millan <rmh.grub@aybabtu.com> 
* commands/search.c (grub_cmd_search): Macroify hardcoded args[]
        indexes.  Check for -f explicitly.
 2009-06-22 19:44:38 +00:00
robertmh
132a0a595f 2009-06-22 Robert Millan <rmh.grub@aybabtu.com> 
* conf/i386-pc.rmk (GRUB_MEMORY_MACHINE_LINK_ADDR): Rename to ...
        (GRUB_KERNEL_MACHINE_LINK_ADDR): ... this.  Update all users.
 2009-06-22 19:23:22 +00:00
robertmh
387a140ce6 2009-06-22 Robert Millan <rmh.grub@aybabtu.com> 
* conf/i386-pc.rmk (kernel_img_SOURCES): Add `kern/i386/misc.S'.
        * conf/i386-ieee1275.rmk: Likewise.
        * conf/i386-coreboot.rmk: Likewise.

        * kern/i386/pc/startup.S (grub_stop): Remove function.
        * kern/i386/ieee1275/startup.S: Likewise.
        * kern/i386/coreboot/startup.S: Likewise.
        * kern/i386/misc.S (grub_stop): New function.
 2009-06-22 18:04:37 +00:00
robertmh
41da966565 2009-06-22 Robert Millan <rmh.grub@aybabtu.com> 
* kern/i386/pc/startup.S (real_to_prot): Move from here ...
        * kern/i386/realmode.S (real_to_prot): ... to here.
 2009-06-22 10:42:37 +00:00
robertmh
bf3372349c 2009-06-22 Robert Millan <rmh.grub@aybabtu.com> 
* conf/i386-ieee1275.rmk (pkglib_PROGRAMS): Replace `kernel.elf'
        with `kernel.img'.
        (kernel_elf_SOURCES): Rename to ...
        (kernel_img_SOURCES): ... this.
        (kernel_elf_HEADERS): Rename to ...
        (kernel_img_HEADERS): ... this.  Update all users.
        (kernel_elf_ASFLAGS): Rename to ...
        (kernel_img_ASFLAGS): ... this.
        (kernel_elf_CFLAGS): Rename to ...
        (kernel_img_CFLAGS): ... this.
        (kernel_elf_LDFLAGS): Rename to ...
        (kernel_img_LDFLAGS): ... this.
        * conf/i386-coreboot.rmk: Likewise.
        * conf/powerpc-ieee1275.rmk: Likewise.

        * util/elf/grub-mkimage.c (add_segments): Replace "kernel.elf"
        with "kernel.img".
 2009-06-22 10:27:26 +00:00
proski
c3cee41331 2009-06-21 Pavel Roskin <proski@gnu.org> 
* loader/powerpc/ieee1275/linux.c (offset_phdr): Fix prototypes
	to match nested functions.
	* loader/sparc64/ieee1275/linux.c: Likewise.
 2009-06-21 23:55:23 +00:00
proski
f52196ff3a 2009-06-21 Pavel Roskin <proski@gnu.org> 
* conf/i386-ieee1275.rmk: Define kernel_elf_ASFLAGS.
 2009-06-21 23:53:30 +00:00
robertmh
58750afcba 2009-06-21 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Enable `END_SYMBOL' / `BSS_START_SYMBOL' test on
        all i386 platforms.
 2009-06-21 20:10:44 +00:00
robertmh
15355c7d2f 2009-06-21 Robert Millan <rmh.grub@aybabtu.com> 
Fix asm file handling on ELF, and remove workarounds.

        * genmk.rb (class Programs): Detect assembly files, and set ASFLAGS
        and -DASM_FILE=1 appropiately (copied from `class Images' stanza).
        * kern/i386/ieee1275/startup.S (ASM_FILE): Remove macro.
        * kern/i386/coreboot/startup.S (ASM_FILE): Likewise.
 2009-06-21 17:24:30 +00:00
phcoder
3f3ec72b38 2009-06-21 Vladimir Serbinenko <phcoder@gmail.com> 
Load BSD ELF modules

	* conf/i386-pc.rmk (bsd_mod_SOURCES): Add loader/i386/bsd32.c
	and loader/i386/bsd64.c
	* include/grub/i386/bsd.h (FREEBSD_MODTYPE_MODULE): Remove
	(FREEBSD_MODTYPE_ELF_MODULE): New definition
	(FREEBSD_MODTYPE_ELF_MODULE_OBJ): Likewise
	(grub_freebsd_load_elfmodule32): New declaration
	(grub_freebsd_load_elfmoduleobj64): Likewise
	(grub_freebsd_load_elf_meta32): Likewise
	(grub_freebsd_load_elf_meta64): Likewise
	(grub_freebsd_add_meta): Likewise
	(grub_freebsd_add_meta_module): Likewise
	* loader/i386/bsd.c (grub_freebsd_add_meta): Make global
	(grub_freebsd_add_meta_module): Likewise and move module-specific
	parts to grub_cmd_freebsd and grub_cmd_freebsd_module
	(grub_cmd_freebsd): Add elf-kernel specific parts
	based on grub_freebsd_add_meta_module
	(grub_cmd_freebsd_module): Add type parsing moved from
	grub_freebsd_add_meta_module
	(grub_cmd_freebsd_module_elf): New function
	(cmd_freebsd_module_elf): New variable
	(GRUB_MOD_INIT): Register freebsd_module_elf
	* loader/i386/bsd32.c: New file
	* loader/i386/bsd64.c: Likewise
	* loader/i386/bsdXX.c: Likewise
	* kern/elf.c (grub_elf32_load): Let hook decide which pheaders to load
	(grub_elf64_load): Likewise
	* include/grub/elfload.h (grub_elf32_load_hook_t): New parameter do_load
	All users updated
	(grub_elf64_load_hook_t): Likewise
 2009-06-21 15:48:10 +00:00
robertmh
0db15301d1 2009-06-21 Colin Watson <cjwatson@ubuntu.com> 
* util/grub-mkconfig.in (GRUB_DISABLE_LINUX_RECOVERY): Export
        variable.
        * util/grub.d/10_linux.in: If GRUB_DISABLE_LINUX_RECOVERY is true,
        don't write a menu entry for recovery mode.
 2009-06-21 11:21:59 +00:00
robertmh
546796c1d7 2009-06-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/i386/pc/grub-mkimage.c (main): Oops, free `output' only
        after it's no longer needed.
 2009-06-20 14:32:53 +00:00
robertmh
cd7310d5d5 2009-06-20 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/i386/loader.h (grub_linux_prot_size)
        (grub_linux_tmp_addr, grub_linux_real_addr)
        (grub_linux_is_bzimage, grub_linux16_boot): Declare only on
        GRUB_MACHINE_PCBIOS.
        * util/i386/pc/grub-mkimage.c (compress_kernel): Move
        common grub_util_info() call to ...
        (generate_image): ... here.
        Fix use of uninitialized memory, comparison of signed with
        unsigned integers and memory leak.
        Remove bogus module address message.
 2009-06-20 14:11:45 +00:00
phcoder
ab32d3b5fe 2009-06-20 Vladimir Serbinenko <phcoder@gmail.com> 
* disk/mdraid_linux.c (GRUB_MOD_FINI): use grub_raid_unregister and not
	grub_raid_register
	* disk/dmraid_nvidia.c (GRUB_MOD_FINI): likewise
 2009-06-20 03:06:50 +00:00
proski
024ef597ab 2009-06-19 Pavel Roskin <proski@gnu.org> 
* configure.ac: Remove stray AC_MSG_CHECKING.
 2009-06-19 21:33:07 +00:00
proski
dd74360c7d Fix a typo, spacing 2009-06-19 20:35:38 +00:00
phcoder
3ac72b5131 2009-06-19 Vladimir Serbinenko <phcoder@gmail.com> 
* disk/scsi.c (grub_scsi_open): use continue instead of big if
 2009-06-19 17:38:27 +00:00
proski
e14cd81437 2009-06-18 Pavel Roskin <proski@gnu.org> 
* conf/common.rmk: Add fs_file.mod.
	* disk/fs_file.c: New file.
	* include/grub/disk.h (enum grub_disk_dev_id): Add
	GRUB_DISK_DEVICE_FILE_ID.
 2009-06-18 20:00:34 +00:00
phcoder
26586d9875 2009-06-18 Vladimir Serbinenko <phcoder@gmail.com> 
Fix build with Apple's toolchain. Part 2

	* aclocal.m4 (grub_PROG_TARGET_CC): add missing prototype for main and
	a fake start
 2009-06-18 14:25:51 +00:00
phcoder
26de2bcdf2 2009-06-18 Vladimir Serbinenko <phcoder@gmail.com> 
Fix build with Apple's toolchain. Part 1

	* commands/i386/pc/drivemap_int13h.S: use assembly-time constants
	for long calls
	* configure.ac: remove a leftover AC_MSG_RESULT
	(CFLAGS): don't add -Wl,--defsym,___main=0x8100 when building with 
	Apple's toolchain
 2009-06-18 14:02:23 +00:00
phcoder
09b3490b9d 2009-06-18 Vladimir Serbinenko <phcoder@gmail.com> 
Fix warnings

	* fs/ntfscomp.c (decomp_get16): initialize c1 and c2
	(decomp_block): initialize ch
	use grub_memcpy instead of memcpy
 2009-06-18 13:51:06 +00:00
proski
d363867871 2009-06-17 Pavel Roskin <proski@gnu.org> 
* include/grub/i386/coreboot/console.h: Don't use the i386-pc
	version, use declarations needed to use vga_text as the startup
	console.
 2009-06-17 19:42:06 +00:00
proski
c22a006a07 2009-06-17 Pavel Roskin <proski@gnu.org> 
* conf/i386-coreboot.rmk (kernel_elf_SOURCES): Remove
	term/i386/pc/at_keyboard.c, it doesn't need to be compiled into
	the kernel.
	* kern/i386/coreboot/init.c: Don't call grub_at_keyboard_init()
	and grub_at_keyboard_fini(), it's done on module load and
	unload.
 2009-06-17 19:39:36 +00:00
fzielcke
05b129e0d3 2009-06-17 Felix Zielcke <fzielcke@z-51.de> 
* loader/i386/linux.c (grub_cmd_linux): Set grub_error if the
	file can't be found.
	* loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
 2009-06-17 17:19:23 +00:00
phcoder
cf24ed9e2a 2009-06-17 Vladimir Serbinenko <phcoder@gmail.com> 
Fix newline handling

	* include/grub/script_sh.h (grub_lexer_param): new field was_newline
	* script/sh/lexer.c (grub_script_lexer_init): initilaise was_newline
	(grub_script_yylex): don't segfault on unterminated script
	newline terminates command and variable
 2009-06-17 13:47:37 +00:00
phcoder
74aa8e4bf8 2009-06-17 Vladimir Serbinenko <phcoder@gmail.com> 
avoid double grub_adjust_range call. Bug reported by David Simner

	* kern/disk.c (grub_disk_write): change to raw disk access before
	calling disk_read
 2009-06-17 13:15:33 +00:00
fzielcke
1bd265f306 2009-06-17 Colin Watson <cjwatson@ubuntu.com> 
* util/elf/grub-mkimage.c (usage): Prefix each option line with two
	spaces, for the benefit of help2man.
	* util/i386/efi/grub-mkimage.c (usage): Likewise.
 2009-06-17 06:07:36 +00:00
proski
a2d08c06c3 2009-06-16 Pavel Roskin <proski@gnu.org> 
* kern/i386/halt.c: Include grub/machine/init.h.
	* kern/i386/reboot.c: Include grub/cpu/reboot.h.
 2009-06-16 20:55:53 +00:00
fzielcke
b97bcb1953 2009-06-16 Felix Zielcke <fzielcke@z-51.de> 
* util/grub.d/30_os-prober.in: Use ${root} in the generated
	drivemap menuentry.
 2009-06-16 16:59:32 +00:00
fzielcke
0644f96c9f 2009-06-16 James Jarvis <James.Jarvis@ed.ac.uk> 
* commands/help.c GRUB_MOD_INIT(echo): Fix the help output of
	`echo' command.
 2009-06-16 16:06:49 +00:00
proski
3ef17a2ebf 2009-06-16 Pavel Roskin <proski@gnu.org> 
* boot/i386/pc/boot.S: Remove root_drive.  Assert offset of
	boot_drive_check by using GRUB_BOOT_MACHINE_DRIVE_CHECK.  Don't
	save %dx, we only need %dl and we never change it.
	* boot/i386/pc/cdboot.S: Don't set the root drive.
	* boot/i386/pc/pxeboot.S: Likewise.
	* include/grub/i386/pc/boot.h: Remove
	GRUB_BOOT_MACHINE_ROOT_DRIVE, adjust
	GRUB_BOOT_MACHINE_DRIVE_CHECK.
	* include/grub/i386/pc/kernel.h: Remove grub_root_drive.
	* kern/i386/pc/init.c (make_install_device): Remove references
	to grub_root_drive.
	* kern/i386/pc/startup.S: Likewise.
	* util/i386/pc/grub-setup.c (setup): Don't set root_drive.
 2009-06-15 23:25:38 +00:00
phcoder
693fe63766 2009-06-16 Vladimir Serbinenko <phcoder@gmail.com> 
xnu_uuid command

	* commands/xnu_uuid.c: new file
	* conf/common.rmk (pkglib_MODULES): add xnu_uuid.mod
	(xnu_uuid_mod_SOURCES): new variable
	(xnu_uuid_mod_CFLAGS): likewise
	(xnu_uuid_mod_LDFLAGS): likewise
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
	* conf/i386-ieee1275.rmk: likewise
	* conf/i386-pc.rmk: likewise
	* conf/powerpc-ieee1275.rmk: likewise
	* conf/sparc64-ieee1275.rmk: likewise
	* util/grub.d/30_os-prober.in: use UUID for Mac OS X/Darwin
 2009-06-15 22:57:39 +00:00
proski
c9da87d0f3 2009-06-16 Pavel Roskin <proski@gnu.org> 
* configure.ac: Avoid '==' in test command, it's not portable.
 2009-06-15 22:45:17 +00:00
phcoder
9c6f459688 2009-06-16 Vladimir Serbinenko <phcoder@gmail.com> 
Probe command

	* commands/probe.c: new file
	* conf/common.rmk (pkglib_MODULES): add probe.mod
	(probe_mod_SOURCES): new variable
	(probe_mod_CFLAGS): likewise
	(probe_mod_LDFLAGS): likewise
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
	* conf/i386-ieee1275.rmk: likewise
	* conf/i386-pc.rmk: likewise
	* conf/powerpc-ieee1275.rmk: likewise
	* conf/sparc64-ieee1275.rmk: likewise
 2009-06-15 22:41:42 +00:00
phcoder
ebc621eac9 Removed bogus >>>> from ChangeLog 2009-06-15 21:09:41 +00:00
phcoder
15a0c03ead 2009-06-15 Vladimir Serbinenko <phcoder@gmail.com> 
Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c
	(grub_script_yylex): fix parsing of quoting, escaping and newline
 2009-06-15 21:06:58 +00:00
phcoder
f3880eaf5e 2009-06-15 Vladimir Serbinenko <phcoder@gmail.com> 
Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c (check_textstate): accept GRUB_PARSER_STATE_ESC
	(grub_script_yylex): fix parsing of quoting, escaping and newline
 2009-06-15 21:05:50 +00:00
phcoder
3148bc1cbd 2009-06-15 Vladimir Serbinenko <phcoder@gmail.com> 
Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c 
	(grub_script_yylex): fix parsing of quoting, escaping and newline
 2009-06-15 21:04:17 +00:00