]>
git.ipfire.org Git - thirdparty/grub.git/log
Robert Millan [Mon, 18 Jan 2010 13:45:40 +0000 (13:45 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
Fix annoying UI bug in rescue mode. Thanks to Tristan Gingold for
spotting it back in 2008. Shame on me for forgetting he did.
* kern/rescue_reader.c (grub_rescue_run): Skip zero-length lines.
BVK Chaitanya [Mon, 18 Jan 2010 12:29:18 +0000 (17:59 +0530)]
2010-01-18 BVK Chaitanya <bvk.groups@gmail.com>
Added new tool, grub-scrit-check to verify grub.cfg syntax.
* util/grub-script-check.c: grub-script-check tool.
* conf/common.rmk: Make rules for grub-script-check.
BVK Chaitanya [Mon, 18 Jan 2010 11:28:31 +0000 (16:58 +0530)]
update copyright year
BVK Chaitanya [Mon, 18 Jan 2010 11:28:03 +0000 (16:58 +0530)]
merge trunk
Robert Millan [Mon, 18 Jan 2010 07:49:50 +0000 (07:49 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_TEXT): ... this. Update all users.
(GRUB_VIDEO_TYPE_VLFB): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_VESA): ... this. Update all users.
(GRUB_VIDEO_TYPE_EFI): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this. Update all users.
Robert Millan [Sun, 17 Jan 2010 17:29:57 +0000 (17:29 +0000)]
2010-01-17 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/test.h: Add license header.
* tests/example_functional_test.c: Likewise.
* tests/example_unit_test.c: Likewise.
* tests/lib/functional_test.c: Likewise.
* tests/lib/test.c: Likewise.
* tests/lib/unit_test.c: Likewise.
Vladimir 'phcoder' Serbinenko [Sun, 17 Jan 2010 16:52:01 +0000 (17:52 +0100)]
2010-01-17 Vladimir Serbinenko <phcoder@gmail.com>
Use flag-based instead of hook-based video mode selection and "auto"
keyword.
* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
(grub_video_set_mode): Changed prototype. All users updated.
(grub_video_check_mode_flag): New inline function.
* video/video.c (parse_modespec): New function.
(grub_video_set_mode): Parse flags and keywords.
carles [Sun, 17 Jan 2010 14:42:19 +0000 (14:42 +0000)]
2010-01-17 Carles Pina i Estany <carles@pina.cat>
* util/misc.c (grub_util_info): Fix the order of the parameters in a
fprintf call.
Felix Zielcke [Sat, 16 Jan 2010 10:57:47 +0000 (11:57 +0100)]
2010-01-16 Grégoire Sutre <gregoire.sutre@gmail.com>
* genmk.rb (class SCRIPT): Replace option -i of sed by a pipe.
carles [Sat, 16 Jan 2010 00:39:14 +0000 (00:39 +0000)]
2010-01-16 Carles Pina i Estany <carles@pina.cat>
* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
string.
* util/grub-emu.c (usage): Likewise.
* util/grub-mkpasswd-pbkdf2.c (usage): Likewise.
* util/i386/efi/grub-mkimage.c (usage): Likewise.
* util/i386/pc/grub-mkimage.c (usage): Likewise.
* util/i386/pc/grub-setup.c (usage): Likewise.
carles [Sat, 16 Jan 2010 00:26:52 +0000 (00:26 +0000)]
2010-01-16 Carles Pina i Estany <carles@pina.cat>
* util/misc.c (grub_util_warn): Gettextizze, print full stop after
the message.
(grub_util_info): Likewise.
(grub_util_error): Likewise.
* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
and/or new lines in `grub_util_warna', `grub_util_info',
`grub_util_error' calls.
* util/getroot.c: Likewise.
* util/grub-editenv.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-fstest.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mkpasswd-pbkdf2.c: Likewise.
* util/grub-mkrelpath.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/hostdisk.c: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/ieee1275/ofpath.c: Likewise.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/write.c: Likewise.
* util/raid.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
Vladimir 'phcoder' Serbinenko [Fri, 15 Jan 2010 20:11:51 +0000 (21:11 +0100)]
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Enable multiboot on non-pc.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (pkglib_MODULES): Move
multiboot.mod and multiboot2.mod to ...
* conf/i386.rmk (pkglib_MODULES): ... here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_SOURCES):
Moved to ...
* conf/i386.rmk (multiboot_mod_SOURCES): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_CFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_CFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_ASFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_ASFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_LDFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_LDFLAGS): .. here.
* conf/x86_64-efi.rmk (pkglib_MODULES): Remove ata.mod and
relocator.mod.
(ata_mod_SOURCES): Removed.
(ata_mod_CFLAGS): Likewise.
(ata_mod_LDFLAGS): Likewise.
(relocator_mod_SOURCES): Removed.
(relocator_mod_CFLAGS): Likewise.
(relocator_mod_ASFLAGS): Likewise.
(relocator_mod_LDFLAGS): Likewise.
Include i386.mk.
* include/grub/x86_64/multiboot.h: New file.
* loader/i386/multiboot.c (grub_multiboot_boot) [GRUB_MACHINE_EFI]:
Terminate EFI.
Vladimir 'phcoder' Serbinenko [Fri, 15 Jan 2010 15:30:57 +0000 (16:30 +0100)]
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Video multiboot support.
* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
New prototype.
* include/multiboot.h: Resynced with multiboot specification.
* include/multiboot2.h: Likewise.
* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): Support video flags.
(grub_multiboot): Parse MULTIBOOT_VIDEO_MODE fields.
* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): New constant.
(HAS_VGA_TEXT): Likewise.
(accepts_video): New variable.
(grub_multiboot_set_accepts_video): New function.
(grub_multiboot_get_mbi_size): Account for video structures.
(set_video_mode): New function.
(retrieve_video_parameters): Likewise.
(grub_multiboot_make_mbi): Fill video fields.
Vladimir 'phcoder' Serbinenko [Fri, 15 Jan 2010 15:11:18 +0000 (16:11 +0100)]
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Video driver ids.
* include/grub/video.h (grub_video_driver_id): New type.
(grub_video_adapter): New member 'id'. All users updated.
(grub_video_get_driver_id): New proto.
* video/video.c (grub_video_get_driver_id): New function.
carles [Thu, 14 Jan 2010 23:20:13 +0000 (23:20 +0000)]
2010-01-14 Carles Pina i Estany <carles@pina.cat>
* util/grub.d/30_os-prober.in: Use `set var=val' rather than plain
`var=val'.
carles [Thu, 14 Jan 2010 23:07:44 +0000 (23:07 +0000)]
2010-01-14 Carles Pina i Estany <carles@pina.cat>
* normal/cmdline.c (print_completion): Gettextizze.
carles [Thu, 14 Jan 2010 23:04:49 +0000 (23:04 +0000)]
2001-01-14 Carles Pina i Estany <carles@pina.cat>
* loader/i386/pc/chainloader.c: Include `<grub/mm.h>'.
carles [Thu, 14 Jan 2010 22:31:06 +0000 (22:31 +0000)]
2010-01-14 Carles Pina i Estany <carles@pina.cat>
* gettext/gettext.c (grub_gettext_translate): Push and pop
grub_errno.
(grub_gettext_delete_list): Change comment style.
* kern/err.c (grub_error): Gettextizze.
(grub_fatal): Gettextizze.
Robert Millan [Thu, 14 Jan 2010 21:08:31 +0000 (21:08 +0000)]
2010-01-14 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/i386/loader.h (grub_linux16_boot): Renamed to ...
(grub_linux16_real_boot): ... this.
* kern/i386/loader.S: Likewise.
* loader/i386/pc/linux.c: Include `<grub/video.h>' and `<grub/mm.h>'.
(grub_linux16_boot): New function. Switches to text mode and calls
grub_linux16_real_boot().
* loader/i386/bsd.c: Include `<grub/video.h>'.
(grub_freebsd_boot, grub_openbsd_boot, grub_netbsd_boot): Switch to
text mode before calling grub_unix_real_boot().
* loader/i386/multiboot.c: Include `<grub/video.h>'.
(grub_multiboot_boot): Switch to text mode before calling
grub_relocator32_boot().
* loader/i386/pc/chainloader.c: Include `<grub/video.h>'.
(grub_chainloader_boot): Switch to text mode before calling
grub_chainloader_real_boot().
Robert Millan [Thu, 14 Jan 2010 18:52:39 +0000 (18:52 +0000)]
2010-01-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
* util/grub-reboot.in: Make sure prev_saved_entry always gets a
non-empty value.
Colin Watson [Thu, 14 Jan 2010 14:06:36 +0000 (14:06 +0000)]
fix changelog dates
Colin Watson [Thu, 14 Jan 2010 14:04:44 +0000 (14:04 +0000)]
merge from trunk
BVK Chaitanya [Thu, 14 Jan 2010 13:45:21 +0000 (19:15 +0530)]
2010-01-14 BVK Chaitanya <bvk.groups@gmail.com>
Unit testing framework for GRUB.
* Makefile.in: Test framework build rules for 'make check'.
* conf/tests.rmk: Build rules for individual tests and framework.
* include/grub/test.h: Header file for whitebox tests.
* tests/lib/functional_test.c: Framework support for whitebox
functional tests.
* tests/lib/test.c: Common whitebox testing code for unit and
functional tests.
* tests/lib/unit_test.c: Framework support for whitebox unit
tests.
* tests/util/grub-shell-tester.in: Support utility for grub-script
tests.
* tests/util/grub-shell.in: Utility to execute grub-script
commands in a Qemu instance.
* tests/example_functional_test.c: Example whitebox functional
test.
* tests/example_grub_script_test.in: Example grub-script test.
* tests/example_scripted_test.in: Example scripted test.
* tests/example_unit_test.c: Example whitebox unit test.
BVK Chaitanya [Thu, 14 Jan 2010 13:15:19 +0000 (18:45 +0530)]
merge trunk
BVK Chaitanya [Thu, 14 Jan 2010 13:09:12 +0000 (18:39 +0530)]
use qemu-system-i386 instead of qemu
BVK Chaitanya [Thu, 14 Jan 2010 11:47:51 +0000 (17:17 +0530)]
removed unnecessary grub_test_* wrappers
Vladimir 'phcoder' Serbinenko [Thu, 14 Jan 2010 11:40:55 +0000 (12:40 +0100)]
2010-01-14 Vladimir Serbinenko <phcoder@gmail.com>
* conf/i386-coreboot.rmk (multiboot_mod_SOURCES):
Add loader/i386/multiboot_mbi.c.
(multiboot2_mod_SOURCES): Likewise.
* conf/i386-pc.rmk (multiboot_mod_SOURCES): Likewise.
(multiboot2_mod_SOURCES): Likewise.
* include/grub/multiboot.h (grub_multiboot_get_mbi_size): New proto.
(grub_multiboot_make_mbi): Likewise.
(grub_multiboot_free_mbi): Likewise.
(grub_multiboot_init_mbi): Likewise.
(grub_multiboot_add_module): Likewise.
(grub_multiboot_set_bootdev): Likewise.
* loader/i386/multiboot.c (mbi): Removed.
(mbi_dest): Likewise.
(alloc_mbi): New variable.
(grub_multiboot_payload_size): Removed. All users updated.
(grub_multiboot_pure_size): New variable.
(grub_multiboot_boot): Use grub_multiboot_make_mbi.
(grub_multiboot_unload): Use grub_multiboot_free_mbi.
(grub_get_multiboot_mmap_len): Moved to loader/i386/multiboot_mbi.c.
(grub_fill_multiboot_mmap): Likewise.
(grub_multiboot_get_bootdev): Likewise.
(grub_multiboot): Use multiboot_mbi functions.
* loader/i386/multiboot_mbi.c: New file.
Vladimir 'phcoder' Serbinenko [Thu, 14 Jan 2010 11:34:23 +0000 (12:34 +0100)]
Merge mainline into abstractmbi
Vladimir 'phcoder' Serbinenko [Wed, 13 Jan 2010 21:53:12 +0000 (22:53 +0100)]
2010-01-13 Vladimir Serbinenko <phcoder@gmail.com>
* kern/efi/init.c (grub_efi_fini): Don't call grub_efi_mm_fini as
it would result in module crash.
Vladimir 'phcoder' Serbinenko [Wed, 13 Jan 2010 19:43:48 +0000 (20:43 +0100)]
2010-01-13 Vladimir Serbinenko <phcoder@gmail.com>
* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Handle '\r'.
(grub_ofconsole_getwh): Split to ...
(grub_ofconsole_getwh): ... this.
(grub_ofconsole_dimensions): ...and this.
(grub_ofconsole_init_output): Call grub_ofconsole_dimensions.
Robert Millan [Wed, 13 Jan 2010 19:10:57 +0000 (19:10 +0000)]
2010-01-13 Robert Millan <rmh.grub@aybabtu.com>
* util/mkisofs/rock.c (generate_rock_ridge_attributes): Fix a typo.
Vladimir 'phcoder' Serbinenko [Tue, 12 Jan 2010 18:47:02 +0000 (19:47 +0100)]
Small cleanup
Vladimir 'phcoder' Serbinenko [Tue, 12 Jan 2010 16:56:05 +0000 (17:56 +0100)]
2010-01-12 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/pc/multiboot2.c: Removed stalled file.
Vladimir 'phcoder' Serbinenko [Tue, 12 Jan 2010 12:36:44 +0000 (13:36 +0100)]
2010-01-12 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkpasswd-pbkdf2.c (main): Use grub_util_init_nls.
Reported by: Grégoire Sutre
BVK Chaitanya [Tue, 12 Jan 2010 10:19:40 +0000 (15:49 +0530)]
build only functional tests on make
BVK Chaitanya [Tue, 12 Jan 2010 05:32:49 +0000 (11:02 +0530)]
merge trunk
BVK Chaitanya [Tue, 12 Jan 2010 05:24:37 +0000 (10:54 +0530)]
added boot device selection to grub-shell
BVK Chaitanya [Tue, 12 Jan 2010 04:46:17 +0000 (10:16 +0530)]
build tests on make, but run on make check
BVK Chaitanya [Tue, 12 Jan 2010 03:53:24 +0000 (09:23 +0530)]
removed unnecessary EXPORT_* macro usage
BVK Chaitanya [Tue, 12 Jan 2010 03:30:55 +0000 (09:00 +0530)]
fixed an error message
Robert Millan [Mon, 11 Jan 2010 14:55:20 +0000 (14:55 +0000)]
2010-01-11 Robert Millan <rmh.grub@aybabtu.com>
* util/misc.c (canonicalize_file_name): New function.
(make_system_path_relative_to_its_root): Use canonicalize_file_name()
instead of realpath().
Colin Watson [Mon, 11 Jan 2010 12:00:57 +0000 (12:00 +0000)]
2010-01-11 Colin Watson <cjwatson@ubuntu.com>
* util/grub-install.in (usage): Clarify meaning of --root-directory,
and make it clearer that it's optional. Based on confusion
witnessed on IRC.
Vladimir 'phcoder' Serbinenko [Sun, 10 Jan 2010 21:35:46 +0000 (22:35 +0100)]
2010-01-10 Vladimir Serbinenko <phcoder@gmail.com>
* term/i386/pc/vga_text.c (inc_y): Fix off-by-one error which resulted
in premature implicit newline.
Vladimir 'phcoder' Serbinenko [Sun, 10 Jan 2010 21:34:25 +0000 (22:34 +0100)]
2010-01-10 Vladimir Serbinenko <phcoder@gmail.com>
* normal/cmdline.c (grub_cmdline_get): Fix off-by-one error
which resulted in garbled command line at the end of screen.
Vladimir 'phcoder' Serbinenko [Sun, 10 Jan 2010 17:58:18 +0000 (18:58 +0100)]
MAnipulate mbi in abstract way
Robert Millan [Sun, 10 Jan 2010 01:43:42 +0000 (01:43 +0000)]
2010-01-10 Robert Millan <rmh.grub@aybabtu.com>
* loader/i386/ieee1275/linux.c (grub_linux_boot): Rework video position
initialization with similar approach as with other Linux loaders.
Robert Millan [Sun, 10 Jan 2010 01:10:39 +0000 (01:10 +0000)]
2010-01-10 Robert Millan <rmh.grub@aybabtu.com>
Fix i386-ieee1275 build.
* loader/i386/ieee1275/linux.c (grub_linux_boot): Use grub_term_width()
and grub_term_height() for video_{width,height} initialization.
Robert Millan [Sun, 10 Jan 2010 00:47:19 +0000 (00:47 +0000)]
2010-01-09 Robert Millan <rmh.grub@aybabtu.com>
Fix grub-emu build.
* conf/any-emu.rmk (grub_emu_SOURCES): Remove `kern/reader.c'.
Robert Millan [Sat, 9 Jan 2010 22:49:18 +0000 (22:49 +0000)]
Merge multiterm branch
Robert Millan [Sat, 9 Jan 2010 22:42:17 +0000 (23:42 +0100)]
Eliminate grub_term_register_{input,output}_active. Default terminals are
automatically activated because they're the only terminal that has been loaded.
This solution is temporary. In the future, all terminals should auto-enable,
but this is non-trivial due to resource conflict, and it shouldn't prevent
merge in trunk.
Robert Millan [Sat, 9 Jan 2010 22:22:48 +0000 (23:22 +0100)]
Merge from trunk
Robert Millan [Sat, 9 Jan 2010 22:02:00 +0000 (22:02 +0000)]
2010-01-09 Robert Millan <rmh.grub@aybabtu.com>
Make loader output a bit more user-friendly.
* util/grub.d/10_hurd.in: Print message indicating that GNU Mach
is being loaded. Likewise for the Hurd.
* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Print message indicating
that kernel of FreeBSD ${version} is being loaded.
* loader/i386/linux.c (grub_cmd_linux): Move debug info to
grub_dprintf().
(grub_cmd_initrd): Likewise.
* util/grub.d/10_linux.in (linux_entry): Print message indicating
that Linux ${version} is being loaded. Likewise for initrd.
carles [Sat, 9 Jan 2010 20:20:27 +0000 (20:20 +0000)]
2010-01-09 Carles Pina i Estany <carles@pina.cat>
* gettext/gettext.c (GRUB_MOD_INIT): Gettextizze.
BVK Chaitanya [Sat, 9 Jan 2010 15:01:52 +0000 (20:31 +0530)]
added changelog
BVK Chaitanya [Sat, 9 Jan 2010 15:01:33 +0000 (20:31 +0530)]
added changelog file
BVK Chaitanya [Sat, 9 Jan 2010 14:57:58 +0000 (20:27 +0530)]
added grub-script-check tool
carles [Fri, 8 Jan 2010 21:35:38 +0000 (21:35 +0000)]
2010-01-08 Carles Pina i Estany <carles@pina.cat>
* loader/efi/appleloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/efi/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/efi/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/xnu.c: Include `<grub/i18n.h>'.
(grub_cpu_xnu_init): Gettextizze.
* loader/multiboot_loader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/powerpc/ieee1275/linux.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/sparc64/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_linux_load64): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/xnu.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* po/POTFILES: Add `loader/efi/appleloader.c',
`loader/efi/chainloader.c', `loader/i386/efi/linux.c',
`loader/i386/ieee1275/linux.c', `loader/i386/linux.c',
`loader/i386/pc/chainloader.c', `loader/i386/pc/linux.c',
`loader/i386/xnu.c', `loader/multiboot_loader.c',
`loader/powerpc/ieee1275/linux.c', `loader/sparc64/ieee1275/linux.c'
and `loader/xnu.c'.
BVK Chaitanya [Fri, 8 Jan 2010 16:36:46 +0000 (22:06 +0530)]
replaced __func__ with simpler __FUNCTION__ macro
BVK Chaitanya [Fri, 8 Jan 2010 15:58:57 +0000 (21:28 +0530)]
added changelog file
Robert Millan [Fri, 8 Jan 2010 15:22:40 +0000 (15:22 +0000)]
2010-01-08 Robert Millan <rmh.grub@aybabtu.com>
* src/mkisofs.c: Remove `ifdef linux' portability kludge.
Robert Millan [Fri, 8 Jan 2010 15:19:42 +0000 (15:19 +0000)]
2010-01-08 Robert Millan <rmh.mkisofs@aybabtu.com>
* util/mkisofs/defaults.h (APPID_DEFAULT): Redefine using PACKAGE_NAME.
(SYSTEM_ID_DEFAULT): Set to "GNU" unconditionally.
* util/mkisofs/mkisofs.c (main): Readjust --version output.
BVK Chaitanya [Fri, 8 Jan 2010 11:05:32 +0000 (16:35 +0530)]
added functional tests to make-check
BVK Chaitanya [Fri, 8 Jan 2010 09:49:10 +0000 (15:19 +0530)]
unit testing framework
Vladimir 'phcoder' Serbinenko [Thu, 7 Jan 2010 21:22:24 +0000 (22:22 +0100)]
ChangeLog
Vladimir 'phcoder' Serbinenko [Thu, 7 Jan 2010 21:22:11 +0000 (22:22 +0100)]
Warning fixes
Vladimir 'phcoder' Serbinenko [Thu, 7 Jan 2010 21:18:59 +0000 (22:18 +0100)]
Various cleanups
Robert Millan [Thu, 7 Jan 2010 21:05:25 +0000 (21:05 +0000)]
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
Reset Multiboot 2 support. New loader implements the draft in
/branches/multiboot2 and shares as much code as possible with the
production Multiboot 1 implementation.
* loader/ieee1275/multiboot2.c: Remove file. Update all users.
* loader/multiboot2.c: Likewise.
* loader/i386/multiboot_helper.S: Likewise.
* include/multiboot2.h: Replace with latest version from the draft
in /branches/multiboot2.
* conf/i386-coreboot.rmk (multiboot_mod_SOURCES): Remove
`loader/i386/multiboot_helper.S', `loader/i386/pc/multiboot2.c'
and `loader/multiboot2.c'.
(pkglib_MODULES): Add `multiboot2.mod'.
(multiboot2_mod_SOURCES): New variable.
(multiboot2_mod_LDFLAGS): Likewise.
(multiboot2_mod_CFLAGS): Likewise. Define `GRUB_USE_MULTIBOOT2'.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Remove `multiboot.mod'.
(multiboot_mod_SOURCES): Remove variable.
(multiboot_mod_LDFLAGS): Likewise.
(multiboot_mod_CFLAGS): Likewise.
* include/grub/multiboot.h [GRUB_USE_MULTIBOOT2]: Include
`<multiboot2.h>' instead of `<multiboot.h>'.
[GRUB_USE_MULTIBOOT2] (MULTIBOOT_BOOTLOADER_MAGIC)
(MULTIBOOT_HEADER_MAGIC): New macros.
* loader/multiboot_loader.c (module_version_status): Remove variable.
(find_multi_boot2_header): Remove function.
(grub_cmd_multiboot_loader): Remove Multiboot 2 / Multiboot 1 selection
logic. Always check for the Multiboot version we're compiling for.
(grub_cmd_module_loader): Likewise.
[GRUB_USE_MULTIBOOT2] (GRUB_MOD_INIT(multiboot)): Register `multiboot2'
command instead of `multiboot'.
Vladimir 'phcoder' Serbinenko [Thu, 7 Jan 2010 20:34:43 +0000 (21:34 +0100)]
merge mainline into multiterm
Robert Millan [Thu, 7 Jan 2010 19:55:16 +0000 (19:55 +0000)]
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
* include/multiboot.h (MULTIBOOT_UNSUPPORTED): Moved from here ...
* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): ... to here. Update
all users.
Robert Millan [Thu, 7 Jan 2010 16:53:29 +0000 (16:53 +0000)]
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
2010-01-07 Vladimir Serbinenko <phcoder@gmail.com>
Fix breakage introduced with previous commit.
* normal/dyncmd.c (read_command_list): Avoid unregistering kernel
commands.
* normal/handler.c (read_handler_list): Revert part of previous commit
affecting this file.
* normal/main.c (read_lists): Move read_handler_list() call back to ...
(grub_normal_execute): ... here.
Robert Millan [Thu, 7 Jan 2010 01:21:32 +0000 (01:21 +0000)]
Simplify terminal check in loader/i386/efi/linux.c and loader/i386/linux.c
Revert loader/i386/ieee1275/linux.c change
Robert Millan [Thu, 7 Jan 2010 00:58:54 +0000 (00:58 +0000)]
Merge from trunk
Robert Millan [Thu, 7 Jan 2010 00:52:56 +0000 (00:52 +0000)]
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
Merge prefix-redefinition-fix branch.
* normal/autofs.c (read_fs_list): Make function capable of being
run multiple times, gracefuly replacing the previous data
structures.
* normal/dyncmd.c (read_command_list): Likewise.
* normal/handler.c (read_handler_list): Likewise.
* normal/main.c (read_lists): New function. Calls all the
list reading functions.
(grub_normal_execute): Use read_lists() instead of calling all
list reading functions explicitly. Register read_lists() as a
variable hook attached to ${prefix}.
Vladimir 'phcoder' Serbinenko [Thu, 7 Jan 2010 00:13:01 +0000 (01:13 +0100)]
2010-01-07 Vladimir Serbinenko <phcoder@gmail.com>
Merge crypto branch.
* Makefile.in (pkglib_DATA): Add crypto.lst.
(crypto.lst): New target.
* commands/hashsum.c: New file.
* commands/password.c (check_password): Use grub_crypto_memcmp.
* commands/password_pbkdf2.c: New file.
* commands/xnu_uuid.c: Remove MD5. Use GRUB_MD_MD5.
* conf/any-emu.rmk (grub_emu_SOURCES): Add lib/crypto.c,
normal/crypto.c and lib/libgcrypt-grub/cipher/md5.c.
(grub_emu_CFLAGS): Add -Wno-missing-field-initializers -Wno-error
-I$(srcdir)/lib/libgcrypt_wrap.
* conf/common.rmk (normal_mod_SOURCES): Add normal/crypto.c.
(pkglib_MODULES): Add crypto.mod, hashsum.mod, pbkdf2.mod and
password_pbkdf2.mod.
(crypto_mod_SOURCES): New variable.
(crypto_mod_CFLAGS): Likewise.
(crypto_mod_LDFLAGS): Likewise.
(hashsum_mod_SOURCES): New variable.
(hashsum_mod_CFLAGS): Likewise.
(hashsum_mod_LDFLAGS): Likewise.
(pbkdf2_mod_SOURCES): New variable.
(pbkdf2_mod_CFLAGS): Likewise.
(pbkdf2_mod_LDFLAGS): Likewise.
(password_pbkdf2_mod_SOURCES): New variable.
(password_pbkdf2_mod_CFLAGS): Likewise.
(password_pbkdf2_mod_LDFLAGS): Likewise.
(bin_UTILITIES): Add grub-mkpasswd-pbkdf2.
(grub_mkpasswd_pbkdf2_SOURCES): New variable.
(grub_mkpasswd_pbkdf2_CFLAGS): Likewise.
Include conf/gcry.rmk.
* include/grub/auth.h: Rewritten.
* include/grub/crypto.h: New file.
* include/grub/disk.h (grub_disk_dev_id): Add GRUB_DISK_DEVICE_LUKS_ID.
* include/grub/normal.h (read_crypto_list): New prototype.
* lib/crypto.c: New file.
* lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
* lib/pbkdf2.c: Likewise.
* normal/auth.c (grub_auth_strcmp): Removed.
(grub_iswordseparator): Likewise.
(grub_auth_strword): Likewise.
(is_authenticated): Use grub_strword.
(grub_auth_check_authentication): Use grub_strcmp, grub_password_get
and grub_strword. Pass entered password to authentication callback.
* normal/crypto.c: New file.
* normal/main.c: Call read_crypto_list.
* util/grub-mkpasswd-pbkdf2.c: New file.
* util/import_gcry.py: Generate crypto.lst. Add hash blocklen.
Vladimir 'phcoder' Serbinenko [Wed, 6 Jan 2010 22:25:57 +0000 (23:25 +0100)]
2010-01-06 Vladimir Serbinenko <phcoder@gmail.com>
Fix descent and ascent calculation.
* util/grub-mkfont.c (grub_font_info): New fields 'asce' and 'max_y'.
(options): New option "asce".
(usage): Likewise.
(add_char): Ignore invalid glyphs for descent calculation.
Calculate ascent from actual content.
(print_glyphs): Use 'asce'.
(write_font): Likewise. Allow ascent override.
(main): Handle "asce" option.
carles [Wed, 6 Jan 2010 22:00:57 +0000 (22:00 +0000)]
2010-01-06 Carles Pina i Estany <carles@pina.cat>
* kern/err.c: Include `<grub/i18n.h>'.
(grub_print_error): Add full stop. Gettextizze.
* loader/i386/bsd.c (grub_netbsd_boot): Change grub_error description.
(grub_bsd_load_elf): Capitalise ELF.
(grub_cmd_freebsd_loadenv): Add `s' in error string.
(grub_cmd_freebsd_module): Likewise.
(grub_cmd_freebsd_module_elf): Likewise.
* loader/i386/bsdXX.c (SUFFIX): Capitalise ELF.
carles [Wed, 6 Jan 2010 21:36:34 +0000 (21:36 +0000)]
2010-01-06 Carles Pina i Estany <carles@pina.cat>
* commands/search.c (GRUB_MOD_INIT): Use HELP_MESSAGE.
* commands/search_file.c (HELP_MESSAGE): New macro.
* commands/search_label.c (HELP_MESSAGE): Likewise.
* commands/search_uuid.c (HELP_MESSAGE): Likewise.
* po/POTFILES: Add `commands/search_file.c',
`commands/search_label.c', `commands_uuid.c'. Remove duplicate
`commands/search.c'.
Robert Millan [Tue, 5 Jan 2010 22:44:00 +0000 (22:44 +0000)]
2010-01-05 Robert Millan <rmh.grub@aybabtu.com>
* config.rpath: Update from Gnulib.
Yves Blusseau [Tue, 5 Jan 2010 21:04:15 +0000 (22:04 +0100)]
2010-01-05 Yves Blusseau <blusseau@zetam.org>
* commands/acpi.c (grub_acpi_create_ebda): fix incorrect message.
Yves Blusseau [Tue, 5 Jan 2010 17:24:10 +0000 (18:24 +0100)]
2010-01-05 Yves Blusseau <yves.blusseau@zetam.org>
* util/sparc64/ieee1275/grub-mkimage.c (main): Typo fix.
Colin Watson [Tue, 5 Jan 2010 16:09:02 +0000 (16:09 +0000)]
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
* util/mkisofs/write.c (padblock_write): Switch size and nmemb
arguments to fread so that we get a return value in bytes, rather
than something that will normally be rounded down to 0.
Adjust error handling to avoid producing garbage when size_t is not
the same size as long long.
Vladimir 'phcoder' Serbinenko [Tue, 5 Jan 2010 15:27:41 +0000 (16:27 +0100)]
Merge mainline into multiterm
Colin Watson [Tue, 5 Jan 2010 12:40:30 +0000 (12:40 +0000)]
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
* util/mkisofs/write.c (padblock_write): Check return value of
fread.
Colin Watson [Tue, 5 Jan 2010 11:16:42 +0000 (11:16 +0000)]
2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-10-05 Colin Watson <cjwatson@ubuntu.com>
* util/grub-reboot.in: Make sure prev_saved_entry always gets a
non-empty value.
Colin Watson [Tue, 5 Jan 2010 10:53:03 +0000 (10:53 +0000)]
merge from trunk
Colin Watson [Tue, 5 Jan 2010 10:41:51 +0000 (10:41 +0000)]
2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-10-05 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/00_header.in: Define a "savedefault" function for use
in menu entries.
* util/grub-mkconfig_lib.in (save_default_entry): Use it.
Colin Watson [Tue, 5 Jan 2010 10:39:30 +0000 (10:39 +0000)]
missing backslash
Colin Watson [Tue, 5 Jan 2010 10:30:14 +0000 (10:30 +0000)]
2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-10-05 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkconfig_lib.in (save_default_entry): Only set
saved_entry if boot_once is unset.
* util/grub.d/00_header.in: Set boot_once to "true" if there was a
previous saved entry (i.e. grub-reboot).
Robert Millan [Tue, 5 Jan 2010 00:31:07 +0000 (00:31 +0000)]
2010-01-05 Robert Millan <rmh.grub@aybabtu.com>
Remove grub-mkfloppy. Images produced by grub-mkrescue are valid
floppy images now.
* util/i386/pc/grub-mkfloppy.in: Remove. Update all users.
Robert Millan [Mon, 4 Jan 2010 23:30:27 +0000 (23:30 +0000)]
2010-01-04 Robert Millan <rmh.grub@aybabtu.com>
* disk/i386/pc/biosdisk.c (grub_biosdisk_rw): Use ALIGN_UP macro
instead of manual alignment.
* kern/disk.c (grub_disk_read): Remove grub_dprintf call (excessively
verbose). Avoid attempts to read past end of the device
(grub_disk_adjust_range() guarantees that we can read `size' bytes,
but GRUB_DISK_CACHE_SIZE may exceed that).
Robert Millan [Mon, 4 Jan 2010 22:49:59 +0000 (22:49 +0000)]
forgot to commit ChangeLog...
Robert Millan [Mon, 4 Jan 2010 22:47:30 +0000 (22:47 +0000)]
2010-01-04 Robert Millan <rmh.grub@aybabtu.com>
* commands/crc.c (grub_cmd_crc): Abort on read errors.
* fs/iso9660.c (grub_iso9660_read): Check for read error and pass
it to upper layer.
Vladimir 'phcoder' Serbinenko [Mon, 4 Jan 2010 13:59:06 +0000 (14:59 +0100)]
2010-01-04 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/efi/api.h (GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE):
New constant.
(grub_efi_piwg_device_path): New structure
(grub_efi_piwg_device_path_t): New type.
* loader/efi/appleloader.c (piwg_full_device_path): New structure.
(devpath_1): Transform to a structure. All users updated.
(devpath_2): Likewise.
(devpath_3): Likewise.
(devpath_4): Likewise.
(devpath_5): Likewise.
Vladimir 'phcoder' Serbinenko [Mon, 4 Jan 2010 13:53:15 +0000 (14:53 +0100)]
2010-01-04 Vladimir Serbinenko <phcoder@gmail.com>
* loader/efi/appleloader.c: Restored. Update all users.
Robert Millan [Sun, 3 Jan 2010 22:34:03 +0000 (22:34 +0000)]
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
* boot/i386/pc/diskboot.S: Fix inaccurate comment.
* util/i386/pc/grub-setup.c: Include `<assert.h>'.
(struct boot_blocklist): Move from here ...
* include/grub/i386/pc/boot.h [ASM_FILE]
(struct grub_boot_blocklist): ... to here. Update all users.
(setup): Only initialize `start' member of `first_block'
structure. Add assert() calls to verify the other members.
* util/i386/pc/grub-mkimage.c: Include `<assert.h>'.
(generate_image): Fix broken blocklist length initialization.
Add assert() call to verify blocklist `segment' field.
Robert Millan [Sun, 3 Jan 2010 22:15:44 +0000 (22:15 +0000)]
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
* loader/efi/appleloader.c: Remove. Update all users.
Robert Millan [Sun, 3 Jan 2010 22:05:07 +0000 (22:05 +0000)]
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
* boot/i386/pc/boot.S: Update copyright year.
* boot/i386/pc/cdboot.S: Likewise.
* boot/i386/pc/diskboot.S: Likewise.
* boot/i386/pc/lnxboot.S: Likewise.
* boot/i386/pc/pxeboot.S: Likewise.
* bus/pci.c: Likewise.
* commands/cmp.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/ls.c: Likewise.
* commands/test.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Likewise.
* disk/ieee1275/nand.c: Likewise.
* disk/ieee1275/ofdisk.c: Likewise.
* disk/lvm.c: Likewise.
* disk/raid.c: Likewise.
* disk/raid6_recover.c: Likewise.
* disk/scsi.c: Likewise.
* fs/affs.c: Likewise.
* fs/cpio.c: Likewise.
* fs/ext2.c: Likewise.
* fs/hfs.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/ntfs.c: Likewise.
* fs/sfs.c: Likewise.
* fs/udf.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* gencmdlist.sh: Likewise.
* genmk.rb: Likewise.
* include/grub/disk.h: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/efi.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/elf.h: Likewise.
* include/grub/fs.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* include/grub/i386/pc/vbe.h: Likewise.
* include/grub/i386/pci.h: Likewise.
* include/grub/i386/tsc.h: Likewise.
* include/grub/ieee1275/ieee1275.h: Likewise.
* include/grub/ntfs.h: Likewise.
* include/grub/sparc64/ieee1275/ieee1275.h: Likewise.
* include/grub/sparc64/libgcc.h: Likewise.
* include/grub/symbol.h: Likewise.
* include/grub/types.h: Likewise.
* include/multiboot2.h: Likewise.
* io/gzio.c: Likewise.
* kern/device.c: Likewise.
* kern/disk.c: Likewise.
* kern/efi/efi.c: Likewise.
* kern/efi/mm.c: Likewise.
* kern/elf.c: Likewise.
* kern/file.c: Likewise.
* kern/i386/dl.c: Likewise.
* kern/i386/pc/init.c: Likewise.
* kern/i386/pc/startup.S: Likewise.
* kern/ieee1275/ieee1275.c: Likewise.
* kern/ieee1275/init.c: Likewise.
* kern/main.c: Likewise.
* kern/mm.c: Likewise.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/x86_64/dl.c: Likewise.
* lib/hexdump.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/multiboot2.c: Likewise.
* loader/ieee1275/multiboot2.c: Likewise.
* loader/multiboot2.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* normal/completion.c: Likewise.
* normal/menu_entry.c: Likewise.
* partmap/apple.c: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/hostfs.c: Likewise.
* video/readers/png.c: Likewise.
Colin Watson [Sun, 3 Jan 2010 21:50:53 +0000 (21:50 +0000)]
2010-01-03 Colin Watson <cjwatson@ubuntu.com>
* include/grub/misc.h (GNUC_PREREQ): New macro.
(ATTRIBUTE_ERROR): New macro.
* include/grub/list.h (grub_bad_type_cast_real): Use
ATTRIBUTE_ERROR.
carles [Sun, 3 Jan 2010 20:48:09 +0000 (21:48 +0100)]
2010-01-03 Carles Pina i Estany <carles@pina.cat>
* normal/menu_text.c (print_message): Change messages.
carles [Sun, 3 Jan 2010 20:30:04 +0000 (21:30 +0100)]
2010-01-03 Carles Pina i Estany <carles@pina.cat>
* normal/menu_entry.c (store_completion): Gettextizze.