Vladimir 'phcoder' Serbinenko
f3e309ad7d
Use (hd0,msdos1) syntax. Eliminate partmap_iterate
2010-02-06 21:00:53 +01:00
Vladimir 'phcoder' Serbinenko
bc6fcf0931
merge mainline into nestpart
2010-02-06 18:47:17 +01:00
Vladimir 'phcoder' Serbinenko
15cb7d433f
Reimport nestpart
2010-02-06 18:43:37 +01:00
Vladimir 'phcoder' Serbinenko
1f534b6908
Merge mainline into gfxmenu
2010-02-03 01:24:07 +01:00
BVK Chaitanya
275d6f6bd4
fix grub-script-check
2010-01-28 21:43:28 +05:30
carles
de0b7a4ed1
2010-01-25 Carles Pina i Estany <carles@pina.cat>
...
* font/font.c: Include `grub/fontformat.h.
Remove font file format constants.
(grub_font_load): Use the new macros.
* include/grub/fontformat.h: New file.
* util/grub-mkfont.c: Include `grub/fontformat.c'.
(write_font_pf2): Use the new macros.
2010-01-26 20:16:08 +00:00
Robert Millan
3973a59a34
2010-01-26 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_PXE_DL): New macro.
* boot/i386/pc/pxeboot.S: Include `<grub/machine/boot.h>'.
(_start): Macroify `0x7F'.
* kern/i386/pc/init.c: Include `<grub/machine/boot.h>'.
(make_install_device): Use "(pxe)" as fallback prefix when booting
via PXE.
2010-01-26 16:39:37 +00:00
Vladimir 'phcoder' Serbinenko
454fcd1c9b
2010-01-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* configure.ac: Check for _restgpr_14_x.
* include/grub/powerpc/libgcc.h [HAVE__RESTGPR_14_X]: Add _restgpr_*_x
and _savegpr_* prototypes.
2010-01-22 20:40:21 +01:00
Vladimir 'phcoder' Serbinenko
f9ab2e25d3
2010-01-21 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/i386/bsd.h (FREEBSD_N_BIOS_GEOM): Removed.
(grub_freebsd_bootinfo): Rewritten.
* loader/i386/bsd.c (grub_freebsd_boot): Use new grub_freebsd_bootinfo.
2010-01-21 17:35:14 +01:00
Vladimir 'phcoder' Serbinenko
61c501a941
merge mainline into newenv
2010-01-20 21:31:39 +01:00
Vladimir 'phcoder' Serbinenko
f7fcb23c76
merge mainline into pciclean
2010-01-20 20:40:30 +01:00
Vladimir 'phcoder' Serbinenko
ca46729091
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/misc.h (grub_sprintf): Removed. All users switched to
grub_xasprintf or grub_snprintf.
(grub_vsprintf): Likewise.
(grub_snprintf): New proto.
(grub_vsnprintf): Likewise.
(grub_xasprintf): Likewise.
(grub_xvasprintf): Likewise.
* kern/misc.c (grub_vprintf): Use grub_vsnprintf_real.
(grub_sprintf): Removed.
(grub_vsnprintf): New function.
(grub_snprintf): Likewise.
(grub_xvasprintf): Likewise.
(grub_xasprintf): Likewise.
(grub_vsprintf): Renamed to ...
(grub_vsnprintf_real): ...this. New argument max_len.
2010-01-20 09:53:23 +01:00
Vladimir 'phcoder' Serbinenko
61eb45eee7
Rename asprint into xasprintf and avsprintf into xvasprintf
2010-01-20 09:12:47 +01:00
BVK Chaitanya
aca655fd20
fix grub-script-check warnings
2010-01-20 12:48:35 +05:30
Vladimir 'phcoder' Serbinenko
14284856a2
merge mainline into asprintf
2010-01-20 08:06:28 +01:00
Vladimir 'phcoder' Serbinenko
7ee92c32e1
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/font.h (grub_font_load): Fix prototype.
2010-01-20 08:04:39 +01:00
Vladimir 'phcoder' Serbinenko
119c50eab3
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/x86_64/at_keyboard.h: New file.
2010-01-20 08:02:45 +01:00
Vladimir 'phcoder' Serbinenko
2d49abe9e7
merge mainline into asprintf
2010-01-20 07:36:17 +01:00
Robert Millan
ca2a220a74
Resync
2010-01-20 00:47:55 +00:00
Vladimir 'phcoder' Serbinenko
915fc1b8bf
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/multiboot.h: Resynced with spec.
* include/multiboot2.h: Likewise.
* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.
2010-01-20 01:08:46 +01:00
Robert Millan
e022a2d667
Sync with trunk
2010-01-18 20:51:35 +00:00
Robert Millan
9444b678a1
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/term.h (grub_term_register_input,
grub_term_register_output): Check return of terminal init()
routines, and abort if errors are raised.
* commands/terminal.c: Update copyright year.
2010-01-18 19:43:39 +00:00
Vladimir 'phcoder' Serbinenko
6f7db5d676
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/i386/bsd.h: Fix include pathes.
2010-01-18 19:25:20 +01:00
Vladimir 'phcoder' Serbinenko
262bff8d83
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
...
Add missing *BSD copyright headers.
* include/grub/aout.h: Add BSD licence.
* include/grub/i386/bsd.h: Parts under different licences moved to ...
* include/grub/i386/freebsd_linker.h: ... here,
* include/grub/i386/freebsd_reboot.h: ... here,
* include/grub/i386/netbsd_bootinfo.h: ... here,
* include/grub/i386/netbsd_reboot.h: ... here,
* include/grub/i386/openbsd_bootarg.h: ... here,
* include/grub/i386/openbsd_reboot.h: ... and here. Added appropriate
licence to each file.
2010-01-18 17:40:23 +01:00
Robert Millan
8040619d88
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.
2010-01-18 07:49:50 +00:00
Robert Millan
a0c2a0f6ff
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.
2010-01-17 17:29:57 +00:00
Vladimir 'phcoder' Serbinenko
b0b139075e
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.
2010-01-17 17:52:01 +01:00
Vladimir 'phcoder' Serbinenko
a0b766fc9b
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.
2010-01-15 21:11:51 +01:00
Vladimir 'phcoder' Serbinenko
884ade5654
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.
2010-01-15 16:30:57 +01:00
Vladimir 'phcoder' Serbinenko
0d90e8a6fb
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.
2010-01-15 16:11:18 +01:00
Robert Millan
0a46429a55
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().
2010-01-14 21:08:31 +00:00
BVK Chaitanya
96f60752d1
merge trunk
2010-01-14 18:45:19 +05:30
BVK Chaitanya
0b8891c276
removed unnecessary grub_test_* wrappers
2010-01-14 17:17:51 +05:30
BVK Chaitanya
528aeaeabb
merge trunk
2010-01-12 11:02:49 +05:30
BVK Chaitanya
350285caae
removed unnecessary EXPORT_* macro usage
2010-01-12 09:23:24 +05:30
Vladimir 'phcoder' Serbinenko
cd0514794a
MAnipulate mbi in abstract way
2010-01-10 18:58:18 +01:00
Vladimir 'phcoder' Serbinenko
85a2cf749f
merge mainline into mips
2010-01-10 13:34:48 +01:00
Robert Millan
822873a7da
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.
2010-01-09 23:42:17 +01:00
Robert Millan
75cc5b682e
Merge from trunk
2010-01-09 23:22:48 +01:00
BVK Chaitanya
5cc318eb35
replaced __func__ with simpler __FUNCTION__ macro
2010-01-08 22:06:46 +05:30
BVK Chaitanya
169b1cd2d8
added functional tests to make-check
2010-01-08 16:35:32 +05:30
BVK Chaitanya
6fc804ffbb
unit testing framework
2010-01-08 15:19:10 +05:30
Robert Millan
bc8b32b3ec
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'.
2010-01-07 21:05:25 +00:00
Vladimir 'phcoder' Serbinenko
44fcb2bc59
merge mainline into multiterm
2010-01-07 21:34:43 +01:00
Robert Millan
5d2c52b8ca
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.
2010-01-07 19:55:16 +00:00
Vladimir 'phcoder' Serbinenko
607a3701db
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.
2010-01-07 01:13:01 +01:00
Vladimir 'phcoder' Serbinenko
4d253049d5
Fix non-clearing of timeout. Template support for timeout text.
2010-01-06 01:42:21 +01:00
Vladimir 'phcoder' Serbinenko
27708b75ca
Merge gfxmenu into gfxmenu+multiterm
2010-01-05 19:38:50 +01:00
Vladimir 'phcoder' Serbinenko
b9da170080
Preliminary support for mixed percent and linear declarations
2010-01-05 19:38:11 +01:00
Vladimir 'phcoder' Serbinenko
e6e86df1de
Merge multiterm into gfxmenu+multiterm
2010-01-05 16:34:10 +01:00