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

704 commits

Author SHA1 Message Date
Robert Millan
af75a9f19a 2010-01-27 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub-fstest.c (fstest): Rewrite allocation, fixing a few
	memleak conditions.
 2010-01-27 01:49:11 +00:00
carles
254e2ce596 2010-01-27 Carles Pina i Estany <carles@pina.cat> 
* util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
	(grub_util_lvm_isvolume): Use LVM_DEV_MAPPER_STRING.
 2010-01-27 00:19:46 +00:00
carles
b510928c38 2010-01-26 Carles Pina i Estany <carles@pina.cat> 
* util/bin2h.c (usage): Fix warning (space after backslash).
 2010-01-26 21:23:59 +00:00
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
94e7e71281 2010-01-26 Robert Millan <rmh.grub@aybabtu.com> 
* util/bin2h.c (usage): Make --help actually explain what `grub-bin2h'
	does.
 2010-01-26 18:12:49 +00:00
Colin Watson
847effd8bf 2010-01-25 Colin Watson <cjwatson@ubuntu.com> 
* util/hostdisk.c (open_device): Add trailing newline to debug
	message.
 2010-01-25 17:04:22 +00:00
Grégoire Sutre
ea4a7e35eb 2010-01-25 Grégoire Sutre <gregoire.sutre@gmail.com> 
* configure.ac: Check for `limits.h'.
	* util/misc.c: Include `<limits.h>' (for PATH_MAX).
 2010-01-25 10:06:55 +01:00
Samuel Thibault
c273d4cea9 2010-01-24 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub.d/10_hurd.in: Add a recovery mode.
 2010-01-24 14:30:10 +01:00
Vladimir 'phcoder' Serbinenko
01fc7054b9 2010-01-21 Vladimir Serbinenko <phcoder@gmail.com> 
* util/misc.c (make_system_path_relative_to_its_root): Fix typo.
 2010-01-21 13:58:40 +01:00
Felix Zielcke
67eb14272d 2010-01-20 Felix Zielcke <fzielcke@z-51.de> 
* util/misc.c (make_system_path_relative_to_its_root): Change the work
	around for handling "/" to the correct fix.  Fix a memory leak.  Use
	xstrdup instead of strdup.
 2010-01-20 23:53:53 +01:00
Vladimir 'phcoder' Serbinenko
f7fcb23c76 merge mainline into pciclean 2010-01-20 20:40:30 +01:00
Robert Millan
96d73208a1 2010-01-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/10_linux.in (linux_entry): Set gfxpayload=keep when it
	can be reliably determined to be supported.
 2010-01-20 17:01:12 +00:00
Robert Millan
f66924a414 2010-01-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/misc.c (make_system_path_relative_to_its_root): Work around
	special-casing of "/", as previous incarnation of this routine did.
 2010-01-20 14:40:00 +00:00
Robert Millan
34a66d995b 2010-01-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/00_header.in: Fix stupid mistake from last commit.
 2010-01-20 14:10:46 +00:00
Robert Millan
94fabf587a 2010-01-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/00_header.in: Fix handling of locale_dir.
 2010-01-20 13:55:30 +00:00
Vladimir 'phcoder' Serbinenko
61eb45eee7 Rename asprint into xasprintf and avsprintf into xvasprintf 2010-01-20 09:12:47 +01:00
Vladimir 'phcoder' Serbinenko
2d49abe9e7 merge mainline into asprintf 2010-01-20 07:36:17 +01:00
Colin Watson
917dd37040 2010-01-20 Dan Merillat <debian@dan.merillat.org> 
* kern/device.c (grub_device_iterate): Allocate new part_ent
	structure based on sizeof (*p) rather than sizeof (p->next), to
	account for structure padding.

	* util/grub-probe.c (probe_raid_level): Return -1 immediately if
	disk is NULL, which might happen for LVM physical volumes with no
	LVM signature.
 2010-01-20 02:11:07 +00:00
Robert Millan
e3538adaea 2009-12-20 Robert Millan <rmh.grub@aybabtu.com> 
* kern/mips/yeeloong/init.c (grub_video_sm712_init)
	(grub_video_video_init, grub_video_bitmap_init)
	(grub_font_manager_init, grub_term_gfxterm_init)
	(grub_at_keyboard_init): New extern declarations.
	(grub_machine_init): Initialize gfxterm and at_keyboard.
	
	* kern/main.c (grub_main): Revert grub_printf delay kludge.
	
	* util/grub-install.in: Revert embed of `at_keyboard.mod' and
	`gfxterm.mod' into core image.
	
	* conf/mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): Copy to ...
	
	* conf/mips-qemu-mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): ... here, and ...
	
	* conf/mips-yeeloong.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): ... here.
	
	(kernel_img_SOURCES): Add files necessary for output (gfxterm)
	and input (at_keyboard) terminals in kernel.
	(kernel_img_CFLAGS): Add `-DUSE_ASCII_FAILBACK'.
	
	(pkglib_MODULES): Remove `pci.mod'.
	(pci_mod_SOURCES, pci_mod_CFLAGS, pci_mod_LDFLAGS)
	(sm712_mod_SOURCES, sm712_mod_CFLAGS, sm712_mod_LDFLAGS)
	(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
	(at_keyboard_mod_LDFLAGS): Remove variables.
 2010-01-20 01:19:53 +00:00
Robert Millan
ca2a220a74 Resync 2010-01-20 00:47:55 +00:00
Robert Millan
e022a2d667 Sync with trunk 2010-01-18 20:51:35 +00:00
Robert Millan
3d8b4e4e26 Resync with trunk 2010-01-18 19:34:26 +00:00
BVK Chaitanya
2997c41ffd update copyright year 2010-01-18 16:58:31 +05:30
BVK Chaitanya
d8d4217e3c merge trunk 2010-01-18 16:58:03 +05:30
carles
ea379330f9 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.
 2010-01-17 14:42:19 +00:00
carles
409ae1c92a 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.
 2010-01-16 00:39:14 +00:00
carles
70a14d3d49 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.
 2010-01-16 00:26:52 +00:00
carles
5c71db1b9b 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'.
 2010-01-14 23:20:13 +00:00
Robert Millan
885d1a8d90 Support --help and --version in grub-bin2h. 2010-01-14 20:33:10 +00:00
Colin Watson
7d1468e4b6 merge from trunk 2010-01-14 14:04:44 +00:00
Robert Millan
58655a160b 2010-01-13 Robert Millan <rmh.grub@aybabtu.com> 
* util/mkisofs/rock.c (generate_rock_ridge_attributes): Fix a typo.
 2010-01-13 19:10:57 +00: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
Robert Millan
92ab12b092 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().
 2010-01-11 14:55:20 +00:00
Colin Watson
a788afb626 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.
 2010-01-11 12:00:57 +00:00
carles
d1fb0f65de 2010-01-10 Carles Pina i Estany <carles@pina.cat> 
* font/font.c: Update copyright years.
	* util/grub-mkfont.c (write_font_ascii_bitmap): Change comment format.
 2010-01-11 00:10:38 +00:00
carles
26ba5c2262 2010-01-10 Carles Pina i Estany <carles@pina.cat> 
* font/font.c: Include `ascii.h'.
	(ASCII_BITMAP_SIZE): New macro.
	(ascii_font_glyph): Define.
	(ascii_glyph_lookup): New function.
	(grub_font_get_string_width): Change comment. If glyph not found, use
	ascii_glyph_lookup.
	(grub_font_get_glyph_with_fallback): If glyph not available returns
	ascii_glyph_lookup.
	* util/grub-mkfont.c (file_formats): New enum.
	(options): Add `ascii-bitmaps' new option.
	(usage): Add `asii-bitmaps' new option.
	(write_font_ascii_bitmap): New function.
	(write_font): Rename to ...
	(write_font_p2): ... this. Remove print_glyphs call.
	(main): Use file_format. Implement code for ranges if ascii-bitmaps is
	used. Call print_glyphs.
	* Makefile.in (pkgdata_DATA): Add `font/ascii.h'.
 2010-01-10 23:33:57 +00:00
Robert Millan
f40f890a12 Eliminate obnoxious length parameter 2010-01-11 00:03:42 +01:00
Robert Millan
0b4de51491 2010-01-10 Robert Millan <rmh.grub@aybabtu.com> 
* conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
        (grub_bin2h_SOURCES): New variable.
        * util/bin2h.c: New file.
 2010-01-10 23:13:53 +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
Robert Millan
1a064917fe 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.
 2010-01-09 22:02:00 +00:00
BVK Chaitanya
21a99f5804 added grub-script-check tool 2010-01-09 20:27:58 +05:30
Robert Millan
b394b2cab8 2010-01-08 Robert Millan <rmh.grub@aybabtu.com> 
* src/mkisofs.c: Remove `ifdef linux' portability kludge.
 2010-01-08 15:22:40 +00:00
Robert Millan
cd943b7587 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.
 2010-01-08 15:19:42 +00:00
Robert Millan
c1d2f1d81b Merge from trunk 2010-01-07 00:58:54 +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
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
Yves Blusseau
6581dd3a58 2010-01-05 Yves Blusseau <yves.blusseau@zetam.org> 
* util/sparc64/ieee1275/grub-mkimage.c (main): Typo fix.
 2010-01-05 18:24:10 +01:00
Colin Watson
3bff18c5c6 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.
 2010-01-05 16:09:02 +00:00