Commit Graph
100 Commits
Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko 9efe142861 Use linux.c on i386-ieee1275 2010-01-13 17:27:45 +01:00
Vladimir 'phcoder' Serbinenko 8071fb7997 ieee1275 support in linux.c 2010-01-13 17:26:47 +01:00
Vladimir 'phcoder' Serbinenko 8b889c332a Fix bug when whole region is free 2010-01-13 17:25:49 +01:00
Vladimir 'phcoder' Serbinenko a52dadc592 merge mainline into newreloc 2010-01-13 14:12:47 +01:00
Vladimir 'phcoder' Serbinenko d1b3ffe8ce merge efigfx into newreloc 2010-01-13 14:12:24 +01:00
Vladimir 'phcoder' Serbinenko 4d27140f7f Removed efi linux loader (now it's in i386/linux.c) 2010-01-13 14:05:39 +01:00
Vladimir 'phcoder' Serbinenko c8142599fc Merge i386/efi/linux.c into i386/linux.c 2010-01-13 14:03:54 +01:00
Vladimir 'phcoder' Serbinenko ca732b36c1 Video driver ID. 2010-01-13 14:03:18 +01:00
Vladimir 'phcoder' Serbinenko 19eb83d486 Include i386.rmk into x86_64-efi.rmk 2010-01-13 14:02:32 +01:00
Vladimir 'phcoder' Serbinenko 37480ee490 Added needed casts 2010-01-13 13:41:15 +01:00
Vladimir 'phcoder' Serbinenko 73f6ce4ab2 x86_64 support for relocator 2010-01-12 23:30:52 +01:00
Vladimir 'phcoder' Serbinenko 11aadbadfb fix compilation on coreboot 2010-01-12 23:03:56 +01:00
Vladimir 'phcoder' Serbinenko e39029dd1e Remove i386/loader.S 2010-01-12 22:24:41 +01:00
Vladimir 'phcoder' Serbinenko e6e7b4ea1f Remove i386/loader.h 2010-01-12 22:22:36 +01:00
Vladimir 'phcoder' Serbinenko 1b86596ae1 Remove OS area 2010-01-12 22:17:44 +01:00
Vladimir 'phcoder' Serbinenko c911e8791a Port linux16 to relocator framework 2010-01-12 22:17:26 +01:00
Vladimir 'phcoder' Serbinenko 14dacc815a Clarify type of cmd_line_ptr 2010-01-12 22:16:33 +01:00
Vladimir 'phcoder' Serbinenko cdab631686 Relocator16 support 2010-01-12 22:15:50 +01:00
Vladimir 'phcoder' Serbinenko 49a716be3b Possibility to prefer higher or lower chunks in relocator 2010-01-12 22:14:26 +01:00
Vladimir 'phcoder' Serbinenko 611f8f0eb9 Remove unused BSD helpers 2010-01-12 17:57:04 +01:00
Vladimir 'phcoder' Serbinenko 10891398fd 2010-01-12 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/pc/multiboot2.c: Removed stalled file.
2010-01-12 17:56:05 +01:00
Vladimir 'phcoder' Serbinenko 73910decff Fix various bugs in *bsd. Freebsd64 on relocators 2010-01-12 17:50:11 +01:00
Vladimir 'phcoder' Serbinenko 14933205d1 Relocator64 support 2010-01-12 17:48:51 +01:00
Vladimir 'phcoder' Serbinenko 1d24828f20 Fix out of memory hang. Add sanity checks 2010-01-12 17:47:14 +01:00
Vladimir 'phcoder' Serbinenko 8468cbeccd Fix typo in relocator32.S 2010-01-12 17:46:17 +01:00
Vladimir 'phcoder' Serbinenko 0b8a223cb1 2010-01-12 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkpasswd-pbkdf2.c (main): Use grub_util_init_nls.
	Reported by: Grégoire Sutre
2010-01-12 13:36:44 +01:00
Vladimir 'phcoder' Serbinenko 108408aa39 BSD on relocators 2010-01-11 22:54:40 +01:00
Vladimir 'phcoder' Serbinenko d45dca5ab3 Fix few bugs in relocators 2010-01-11 22:54:20 +01:00
Vladimir 'phcoder' Serbinenko 55b40bc68a Ported linux to relocator framework 2010-01-11 14:59:01 +01:00
Vladimir 'phcoder' Serbinenko cb1b2ad7e0 Reenable XNU 2010-01-11 13:43:44 +01:00
Vladimir 'phcoder' Serbinenko 669a1c01fb Fix various mistakes 2010-01-11 13:43:31 +01:00
Vladimir 'phcoder' Serbinenko 796d2fa20e Remove uselees instruction 2010-01-11 13:42:45 +01:00
Vladimir 'phcoder' Serbinenko b56495543a Fix variable name collision 2010-01-11 13:40:59 +01:00
Vladimir 'phcoder' Serbinenko d2601bb7bc decrease scope of code_size 2010-01-11 11:32:41 +01:00
Vladimir 'phcoder' Serbinenko 5c8e58b0cb merge abstractmbi into newreloc 2010-01-11 11:29:52 +01:00
Vladimir 'phcoder' Serbinenko ffa8e3d277 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.
2010-01-10 22:35:46 +01:00
Vladimir 'phcoder' Serbinenko e9060a9d3b 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.
2010-01-10 22:34:25 +01:00
Vladimir 'phcoder' Serbinenko 7e267737b6 Add align to .S files 2010-01-10 18:59:31 +01:00
Vladimir 'phcoder' Serbinenko cd0514794a MAnipulate mbi in abstract way 2010-01-10 18:58:18 +01:00
Vladimir 'phcoder' Serbinenko 14e43c6e02 First working newreloc 2010-01-10 15:06:17 +01:00
Vladimir 'phcoder' Serbinenko 6b60576149 merge mainline into newreloc 2010-01-10 01:56:47 +01:00
Vladimir 'phcoder' Serbinenko 95c7fc3f55 First compileable newreloc 2010-01-10 00:30:33 +01:00
Vladimir 'phcoder' Serbinenko 1dcb8d30a9 ChangeLog 2010-01-07 22:22:24 +01:00
Vladimir 'phcoder' Serbinenko 3b88cbbda5 Warning fixes 2010-01-07 22:22:11 +01:00
Vladimir 'phcoder' Serbinenko fc054c9cb8 Various cleanups 2010-01-07 22:18:59 +01:00
Vladimir 'phcoder' Serbinenko 44fcb2bc59 merge mainline into multiterm 2010-01-07 21:34:43 +01: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 42841caa75 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.
2010-01-06 23:25:57 +01:00
Vladimir 'phcoder' Serbinenko 519634516f Merge mainline into multiterm 2010-01-05 16:27:41 +01:00
Vladimir 'phcoder' Serbinenko 52c2d97f26 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.
2010-01-04 14:59:06 +01:00
Vladimir 'phcoder' Serbinenko 98ff6a54de 2010-01-04 Vladimir Serbinenko <phcoder@gmail.com>
* loader/efi/appleloader.c: Restored. Update all users.
2010-01-04 14:53:15 +01:00
Vladimir 'phcoder' Serbinenko e44721e811 Fix punctuation in ChangeLog 2009-12-31 15:05:12 +01:00
Vladimir 'phcoder' Serbinenko 33433555f3 2009-12-31 BVK Chaitanya <bvk.groups@gmail.com>
* include/grub/list.h (grub_assert_fail): Removed.
	(grub_bad_type_cast_real): New function.
	(grub_bad_type_cast): New macro.
	(GRUB_AS_LIST): Use grub_bad_type_cast.
	(GRUB_AS_LIST_P): Likewise.
	(GRUB_AS_NAMED_LIST): Likewise.
	(GRUB_AS_NAMED_LIST_P): Likewise.
	(GRUB_AS_PRIO_LIST): Likewise.
	(GRUB_AS_PRIO_LIST_P): Likewise.
	* include/grub/handler.h (GRUB_AS_HANDLER): Likewise.
2009-12-31 15:03:09 +01:00
Vladimir 'phcoder' Serbinenko f5a513064c 2009-12-29 Vladimir Serbinenko <phcoder@gmail.com>
* loader/sparc64/ieee1275/linux.c (GRUB_MOD_INIT (linux)):
	Fix syntax error.
2009-12-29 19:06:04 +01:00
Vladimir 'phcoder' Serbinenko d8a1cbbd0b Fix compilation warning 2009-12-29 17:54:27 +01:00
Vladimir 'phcoder' Serbinenko 37f7fb26a3 always_inline cl_print to avoid regparm=3 bug 2009-12-29 13:03:22 +01:00
Vladimir 'phcoder' Serbinenko bd2b242ea2 Fix space after completion 2009-12-29 10:24:10 +01:00
Vladimir 'phcoder' Serbinenko a6f106ce37 Fix i386-ieee1275 compilation 2009-12-28 22:06:30 +01:00
Vladimir 'phcoder' Serbinenko c181849b95 2009-12-27 Vladimir Serbinenko <phcoder@gmail.com>
* kern/parser.c (grub_parser_split_cmdline): Don't dereference NULL.
2009-12-28 01:02:21 +01:00
Vladimir 'phcoder' Serbinenko 13d1f24696 Fix grub-emu compilation 2009-12-27 22:36:09 +01:00
Vladimir 'phcoder' Serbinenko dc71441293 Output \n\r like it was done previously because ncurses is confused by \r\n 2009-12-27 22:35:40 +01:00
Vladimir 'phcoder' Serbinenko f45e1a9fb7 Allocate correct size 2009-12-27 22:34:49 +01:00
Vladimir 'phcoder' Serbinenko 9c8739a456 2009-12-27 Vladimir Serbinenko <phcoder@gmail.com>
* normal/menu_text.c (grub_print_message_indented): Prevent
	past-the-end-of-array dereference.
2009-12-27 22:32:52 +01:00
Vladimir 'phcoder' Serbinenko 3851cc386e Prevent NULL dereferencing when unregistering ciphers 2009-12-27 22:29:22 +01:00
Vladimir 'phcoder' Serbinenko 3e74249c4c 2009-12-27 Vladimir Serbinenko <phcoder@gmail.com>
* video/readers/jpeg.c (GRUB_MOD_FINI (grub_cmd_jpegtest)): Rename to ..
	(GRUB_MOD_FINI (video_reader_jpeg)): ...this
2009-12-27 22:21:48 +01:00
Vladimir 'phcoder' Serbinenko 1975ecdc59 Fix include in kern/term.c 2009-12-27 17:40:36 +01:00
Vladimir 'phcoder' Serbinenko 562e438b77 Add defines for yeeloong 2009-12-27 17:21:49 +01:00
Vladimir 'phcoder' Serbinenko 731ffd8773 Fix EFI compilation 2009-12-26 22:16:14 +01:00
Vladimir 'phcoder' Serbinenko 27a8ee52b4 Remove menu init hooks. They are useless 2009-12-26 16:39:16 +01:00
Vladimir 'phcoder' Serbinenko 9c288be27a 2009-12-25 Vladimir Serbinenko <phcoder@gmail.com>
Use search command for preliminar UUID search.

	* commands/search.c: Split into ...
	* commands/search_wrap.c: ...this
	* commands/search.c: ...and this.
	* commands/search_file.c: New file.
	* commands/search_label.c: New file.
	* commands/search_uuid.c: New file.
	* conf/any-emu.rmk (grub_emu_SOURCES): Remove commands/search.c.
	Add commands/search_wrap.c, commands/search_file.c,
	commands/search_label.c and commands/search_uuid.c.
	* conf/common.rmk (pkglib_MODULES): Remove fs_uuid.mod and fs_file.mod.
	(search_mod_SOURCES): Set to commands/search_wrap.c.
	(pkglib_MODULES): Add search_fs_file.mod, search_fs_uuid.mod and
	search_label.mod.
	(search_fs_file_mod_SOURCES): New variable.
	(search_fs_file_mod_CFLAGS): Likewise.
	(search_fs_file_mod_LDFLAGS): Likewise.
	(search_label_mod_SOURCES): Likewise.
	(search_label_mod_CFLAGS): Likewise.
	(search_label_mod_LDFLAGS): Likewise.
	(search_fs_uuid_mod_SOURCES): New variable.
	(search_fs_uuid_mod_CFLAGS): Likewise.
	(search_fs_uuid_mod_LDFLAGS): Likewise.
	(fs_file_mod_SOURCES): Removed.
	(fs_file_mod_CFLAGS): Likewise.
	(fs_file_mod_LDFLAGS): Likewise.
	(fs_uuid_mod_SOURCES): Removed.
	(fs_uuid_mod_CFLAGS): Likewise.
	(fs_uuid_mod_LDFLAGS): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_install_SOURCES):
	Set to util/grub-install.in.
	* disk/fs_file.c: Removed.
	* disk/fs_uuid.c: Likewise.
	* include/grub/search.h: New file.
	* util/grub-install.in: Handle sparc64.
	Create and use load.cfg.
	* util/sparc64/ieee1275/grub-install.in: Removed.
2009-12-25 23:06:52 +01:00
Vladimir 'phcoder' Serbinenko db9433999c 2009-12-25 Vladimir Serbinenko <phcoder@gmail.com>
* kern/i386/pc/startup.S (grub_biosdisk_get_diskinfo_int13_extensions):
	Ignore return status if CF is cleared.
	(grub_biosdisk_get_diskinfo_standard): Likewise.
2009-12-25 23:01:32 +01:00
Vladimir 'phcoder' Serbinenko 7ebaa2b4ff 2009-12-25 Vladimir Serbinenko <phcoder@gmail.com>
Support for (pxe[:server[:gateway]]) syntax and
	use environment variable for PXE.

	* commands/i386/pc/pxecmd.c (options): Removed.
	(print_ip): Removed.
	(grub_cmd_pxe): Removed
	(grub_cmd_pxe_unload): New function.
	* fs/i386/pc/pxe.c (grub_pxe_disk_data): New structure.
	(grub_pxe_your_ip): Made static.
	(grub_pxe_default_server_ip): Likewise.
	(grub_pxe_default_gateway_ip): Likewise.
	(grub_pxe_blksize): Likewise.
	(parse_ip): New function.
	(grub_pxe_open): Support server and gateway specification.
	(grub_pxe_close): Free disk->data.
	(grub_pxefs_open): Use disk->data.
	(grub_pxefs_read): Likewise.
	(grub_env_write_readonly): New function.
	(set_mac_env): Likewise.
	(set_env_limn_ro): Likewise.
	(parse_dhcp_vendor): Likewise.
	(grub_pxe_detect): Set the environment variables.
	(set_ip_env): New function.
	(write_ip_env): Likewise.
	(grub_env_write_pxe_default_server): Likewise.
	(grub_env_write_pxe_default_gateway): Likewise.
	(grub_env_write_pxe_blocksize): Likewise.
	(GRUB_MOD_INIT(pxe)): Set environment variables.
	* include/grub/i386/pc/pxe.h (grub_pxe_mac_addr): Rename to ...
	(grub_pxe_mac_addr_t): ... this. All users updated.
	(grub_pxe_your_ip): Removed.
	(grub_pxe_server_ip): Likewise.
	(grub_pxe_gateway_ip): Likewise.
	(grub_pxe_blksize): Likewise.
2009-12-25 22:01:06 +01:00
Vladimir 'phcoder' Serbinenko d75d75d93b Fix glitch with escape message 2009-12-25 16:53:54 +01:00
Vladimir 'phcoder' Serbinenko 6066889c88 normal_exit command 2009-12-25 16:28:31 +01:00
Vladimir 'phcoder' Serbinenko 0e76d18c5b Fix various issues in menu editor 2009-12-25 13:18:08 +01:00
Vladimir 'phcoder' Serbinenko a999b9d965 Fix refresh in cmdline 2009-12-25 13:17:27 +01:00
Vladimir 'phcoder' Serbinenko 2e5b307c47 Make menu editor work 2009-12-25 04:12:29 +01:00
Vladimir 'phcoder' Serbinenko 33c1ed4c8d terminal modules autoloading 2009-12-25 03:37:20 +01:00
Vladimir 'phcoder' Serbinenko bf2ebfbe02 Lost hunk 2009-12-25 03:36:42 +01:00
Vladimir 'phcoder' Serbinenko ca04c7a550 Colin Watson's request 2009-12-25 01:20:44 +01:00
Vladimir 'phcoder' Serbinenko fa533ebb5c Various fixes to make multiterm work 2009-12-25 01:13:21 +01:00
Vladimir 'phcoder' Serbinenko 4fc4ee303d Set default console on non-i386-pc 2009-12-25 00:13:03 +01:00
Vladimir 'phcoder' Serbinenko 840f2e6e08 Remove NEED_INIT. 2009-12-25 00:12:36 +01:00
Vladimir 'phcoder' Serbinenko 288031b37c REtrieve position from right console in loader/i386/linux.c 2009-12-25 00:07:52 +01:00
Vladimir 'phcoder' Serbinenko 6d305d4f7d Fix paging. 2009-12-24 23:37:38 +01:00
Vladimir 'phcoder' Serbinenko abd1cab3d9 Fix terminal_* commands 2009-12-24 23:21:27 +01:00
Vladimir 'phcoder' Serbinenko 9f0cd916a4 Restrict terminfo to serial 2009-12-24 23:20:43 +01:00
Vladimir 'phcoder' Serbinenko 686ff5b4d1 Don't output unnecessary newline in command line prompt 2009-12-24 23:19:54 +01:00
Vladimir 'phcoder' Serbinenko 4b4513adb3 bugfix in cmdline handling 2009-12-24 22:55:06 +01:00
Vladimir 'phcoder' Serbinenko 0aa6339849 Working multi-terminal 2009-12-24 21:54:37 +01:00
Vladimir 'phcoder' Serbinenko 3be7f8de12 FORALL_ACTIVE_TERM_OUTPUTS macro 2009-12-24 17:51:43 +01:00
Vladimir 'phcoder' Serbinenko 2322a12693 remove list iterators to save space 2009-12-24 16:25:10 +01:00
Vladimir 'phcoder' Serbinenko 2e71383172 Core changes hopefully finished 2009-12-24 15:34:33 +01:00
Vladimir 'phcoder' Serbinenko e48625a306 merge crypto into multiout 2009-12-24 00:38:41 +01:00
Vladimir 'phcoder' Serbinenko f4c623e170 Work on multi-out terminal 2009-12-24 00:37:11 +01:00
Vladimir 'phcoder' Serbinenko a2e77ce455 merge mainline into crypto 2009-12-23 20:34:26 +01:00
Vladimir 'phcoder' Serbinenko a7a095c71a hashsum support 2009-12-23 20:31:12 +01:00
Vladimir 'phcoder' Serbinenko 0eb11149c9 eliminate dead code and data in des.c 2009-12-23 19:58:33 +01:00
Vladimir 'phcoder' Serbinenko 7316783f35 Crypto module autoloading 2009-12-23 17:33:35 +01:00
Vladimir 'phcoder' Serbinenko 009ec74317 2009-12-23 Vladimir Serbinenko <phcoder@gmail.com>
* video/efi_gop.c (grub_video_gop_get_bitmask): Fix off-by-one in mask
	size counting.
2009-12-23 14:48:55 +01:00