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

981 commits

Author SHA1 Message Date
BVK Chaitanya
c41c00eab6 merged with mainline 2010-04-09 21:44:59 +05:30
Vladimir 'phcoder' Serbinenko
e215d8e02a * util/grub.d/00_header.in: Add few missing quotes. Recognise *.jpeg 
as *.jpg.
 2010-04-09 17:44:03 +02:00
Mario Vazquez
d7c43ba1c0 GRUB_BACKGROUND support. 
* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
	* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
 2010-04-09 17:37:38 +02:00
Vladimir 'phcoder' Serbinenko
d64795c0eb Load fonts and modules for gfxmenu in grub-mkconfig. 
Idea by: Mario Vasquez

	* util/grub.d/00_header.in: Load pf2 and image modules.
 2010-04-09 16:56:07 +02:00
Vladimir 'phcoder' Serbinenko
f267f83a13 grub-mkconfig multiple terminal support. 
* util/grub-mkconfig.in: Handle multiple terminals correctly.
	* util/grub.d/00_header.in: Likewise.
 2010-04-09 16:29:10 +02:00
Colin Watson
df60998c64 * util/grub.d/10_linux.in: Only use the first word of 
GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts
spaces in GRUB_DISTRIBUTOR.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
 2010-04-08 10:54:44 +01:00
Vladimir 'phcoder' Serbinenko
3bf09c9ea8 rename format from raw to yeeloong_flash 2010-04-06 22:23:02 +02:00
Vladimir 'phcoder' Serbinenko
a6132b9f3f Merge mainline into yeeloongfw 2010-04-05 17:35:03 +02:00
Grégoire Sutre
b9396631bc * util/grub-install.in: Add `|| exit 1' to all grub-probe calls 
for which failure is fatal.
 2010-04-03 20:52:06 +02:00
Grégoire Sutre
50479febcf * util/grub-install.in: Use mkdir -p to create grub directory. 
* util/i386/efi/grub-install.in: Likewise.
	* util/ieee1275/grub-install.in: Likewise.
 2010-04-03 20:48:36 +02:00
Grégoire Sutre
bd5a6415b0 * util/i386/efi/grub-dumpdevtree: replaced the non-portable `==' by 
`=' and added double quotes on operands of this equality test.
 2010-04-03 20:23:21 +02:00
Vladimir 'phcoder' Serbinenko
d5631db0f2 grub-mkconfig multiple terminal support. 
* util/grub-mkconfig.in: Handle multiple terminals correctly.
	* util/grub.d/00_header.in: Likewise.
 2010-04-02 21:12:20 +02:00
Vladimir 'phcoder' Serbinenko
c2062d5f3a Remove useless change in grub-emu.c 2010-03-30 14:09:24 +02:00
Vladimir 'phcoder' Serbinenko
f651947b58 Merge mainline into bidi 2010-03-30 11:24:28 +02:00
Vladimir 'phcoder' Serbinenko
a6ab5fb2cf Cut font borders 2010-03-29 03:13:59 +02:00
Vladimir 'phcoder' Serbinenko
3f11c7131e Generate shaping table based on unicode if source font has none 2010-03-29 02:06:40 +02:00
Grégoire Sutre
394a3120a7 Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined, 
which is the case with --disabled-nls.

	* include/grub/i18n.h: Use (defined(ENABLE_NLS)
	&& ENABLE_NLS) instead of ENABLE_NLS in all #if preprocessor macros.
	* util/misc.c: Likewise.
	* util/mkisofs/mkisofs.c: Likewise.
	* util/mkisofs/mkisofs.h: Likewise.
 2010-03-27 12:19:32 +01:00
Vladimir 'phcoder' Serbinenko
d56a6ac7f6 Remove handlers 2010-03-27 00:19:42 +01:00
BVK Chaitanya
baae00df35 merged with mainline 2010-03-26 21:13:06 +05:30
BVK Chaitanya
c299f3d6fb merged with mainline 2010-03-26 20:55:07 +05:30
Vladimir 'phcoder' Serbinenko
c9ea504d25 merge mainline into nestpart 2010-03-26 15:44:13 +01:00
Vladimir 'phcoder' Serbinenko
3c31d9c082 Report freetype errors 2010-03-25 11:56:19 +01:00
Vladimir 'phcoder' Serbinenko
6d107fb2a4 Add ligatures to problem list 2010-03-25 11:26:50 +01:00
Vladimir 'phcoder' Serbinenko
e6d428c1b8 Arabic shaping support 2010-03-24 22:33:00 +01:00
Vladimir 'phcoder' Serbinenko
03e4ef0293 Import data for arabic joining computation 2010-03-24 00:35:38 +01:00
Vladimir 'phcoder' Serbinenko
741b56af5c Moved unicode files to separate directory 2010-03-23 23:25:14 +01:00
Vladimir 'phcoder' Serbinenko
6fd346ea6c Update UnicodeData.txt 2010-03-23 23:20:35 +01:00
Vladimir 'phcoder' Serbinenko
521bf3018f Add character properties checking and a comment about problematic characters 2010-03-23 23:19:27 +01:00
Vladimir 'phcoder' Serbinenko
ce04e79272 Remove leftover variables 2010-03-23 16:02:06 +01:00
BVK Chaitanya
c45d352721 merged in mainline 2010-03-22 17:16:31 +05:30
BVK Chaitanya
ba4be5af25 fixed help message for grub-script-check 2010-03-22 13:25:09 +05:30
Colin Watson
bed1d3524e * util/grub-install.in: Copy .mo files from @datadir@/locale, to 
match where 'make install' puts them.
* util/i386/efi/grub-install.in: Likewise.
 2010-03-21 23:04:02 +00:00
BVK Chaitanya
dd6fee39fa merged mainline 2010-03-21 11:03:41 +05:30
Vladimir 'phcoder' Serbinenko
6f5568ed67 Add mirroring for visual UTF-8 2010-03-16 21:57:34 +01:00
Vladimir 'phcoder' Serbinenko
703cbe63d6 Remove trivial getcharwidth (now implicit) 2010-03-16 21:33:23 +01:00
Vladimir 'phcoder' Serbinenko
6c363dfd54 Fix doublewidth character handling 2010-03-16 21:29:15 +01:00
BVK Chaitanya
8a99e92a69 merge in mainline 2010-03-16 17:42:27 +05:30
Vladimir 'phcoder' Serbinenko
0a239a8211 bidi works in terminal in grub-emu 2010-03-15 21:14:11 +01:00
Vladimir 'phcoder' Serbinenko
dfed5c6bb4 Removed grub_putchar 2010-03-15 11:49:27 +01:00
Vladimir 'phcoder' Serbinenko
53f312c1cf Merge mainline into bidi 2010-03-15 10:28:09 +01:00
BVK Chaitanya
8622549153 merged in mainline 2010-03-14 22:20:55 +05:30
Vladimir 'phcoder' Serbinenko
1d63a066e2 Remove some redundancy in build system. 
* Makefile.in (TARGET_CFLAGS): Add -ffreestanding.
	(TARGET_ASFLAGS): Add -nostdinc -fno-builtin.
	(TARGET_LDFLAGS): Add -nostdlib.
	(TARGET_IMG_LDFLAGS): Likewise.
	* commands/lsmmap.c (grub_cmd_lsmmap) [GRUB_MACHINE_EMU]: Don't do
	anything since mmap isn't available.
	* conf/any-emu.rmk (kernel_img_SOURCES): Remove commands/boot.c.
	Add util/time.c.
	(pkglib_MODULES): Remove reboot.mod.
	(reboot_mod_SOURCES): Removed.
	(reboot_mod_CFLAGS): Likewise.
	(reboot_mod_LDFLAGS): Likewise.
	* conf/common.rmk (script/lexer.c_DEPENDENCIES): New variable.
	(MOSTLYCLEANFILES): Add symlist.c kernel_syms.lst.
	(DEFSYMFILES): Add kernel_syms.lst.
	(kernel_img_HEADERS): Add common headers.
	(symlist.c): New target.
	(kernel_syms.lst): Likewise.
	(pkglib_MODULES): Add memdisk.mod.
	(memdisk_mod_SOURCES): New variable.
	(memdisk_mod_CFLAGS): Likewise.
	(memdisk_mod_LDFLAGS): Likewise.
	(pkglib_MODULES): Add reboot.mod.
	(reboot_mod_SOURCES): New variable.
	(reboot_mod_CFLAGS): Likewise.
	(reboot_mod_LDFLAGS): Likewise.
	(pkglib_MODULES): Add date.mod.
	(date_mod_SOURCES): New variable.
	(date_mod_CFLAGS): Likewise.
	(date_mod_LDFLAGS): Likewise.
	(pkglib_MODULES): Add datehook.mod.
	(datehook_mod_SOURCES): New variable.
	(datehook_mod_CFLAGS): Likewise.
	(datehook_mod_LDFLAGS): Likewise.
	(pkglib_MODULES): Add lsmmap.mod.
	(lsmmap_mod_SOURCES): New variable.
	(lsmmap_mod_CFLAGS): Likewise.
	(lsmmap_mod_LDFLAGS): Likewise.
	(pkglib_MODULES): Add boot.mod.
	(boot_mod_SOURCES): New variable.
	(boot_mod_CFLAGS): Likewise.
	(boot_mod_LDFLAGS): Likewise.
	* conf/i386-coreboot.rmk: Removed redundant parts.
	* conf/i386-ieee1275.rmk: Likewise.
	* conf/i386-pc.rmk: Likewise.
	* conf/mips-yeeloong.rmk: Likewise.
	* conf/mips.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.
	* conf/sparc64-ieee1275.rmk: Likewise.
	* conf/x86_64-efi.rmk: Likewise.
	* conf/i386-coreboot.rmk: Moved qemu parts ..
	* conf/i386-qemu.rmk: ... here
	* conf/i386-efi.rmk: Moved common parts to...
	* conf/x86-efi.rmk: ... here.
	* conf/i386.rmk: Added modules common to all x86 variants.
	* configure.ac: Add -m32/-m64 to TARGET_ASFLAGS.
	* disk/memdisk.c: Remove grub/machine/kernel.h.
	* gensymlist.sh.in: Include symbol.h.
	* hook/datehook.c: Correct module name.
	* include/grub/datetime.h (grub_get_datetime) [GRUB_MACHINE_EMU]: Export.
	(grub_set_datetime) [GRUB_MACHINE_EMU]: Likewise.
	* include/grub/i386/efi/serial.h: New file.
	* include/grub/x86_64/efi/serial.h: Likewise.
	* util/time.c: Likewise.
	* video/ieee1275.c (grub_video_ieee1275_setup): Handle 64-bit void *.
 2010-03-14 17:17:49 +01:00
Colin Watson
08e46ededa Speed up consecutive hostdisk operations on the same device. 
* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
(grub_util_biosdisk_open): Initialise disk->data.
(struct linux_partition_cache): New structure.
(linux_find_partition): Cache partition start positions; these are
expensive to compute on every read and write.
(open_device): Cache open file descriptor in disk->data, so that we
don't have to reopen it and flush the buffer cache for consecutive
operations on the same device.
(grub_util_biosdisk_close): New function.
(grub_util_biosdisk_dev): Set `close' member.

* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
 2010-03-14 15:39:14 +00:00
Vladimir 'phcoder' Serbinenko
dae79b6b05 Merge mainline into emu-mod 2010-03-14 16:27:54 +01:00
Vladimir 'phcoder' Serbinenko
016a671b51 Merge mainline into cleanbuild 2010-03-14 16:01:31 +01:00
Vladimir 'phcoder' Serbinenko
313df2f552 Merge mainline into sparc-mkimage 2010-03-14 15:21:04 +01:00
Thorsten Glaser
d68b491ee2 * util/grub-mkrescue.in: Base ISO UUID on UTC. 2010-03-14 13:48:55 +01:00
Matt Kraai
4e02ed5014 2010-03-08 Matt Kraai <kraai@ftbfs.org> 
* util/i386/pc/grub-setup.c (setup): Fix a grammatical error (Debian
	bug #559005).
 2010-03-08 22:20:02 +00:00
Vladimir 'phcoder' Serbinenko
c28e2d120b merge mainline into yeeloongfw 2010-03-07 23:21:09 +01:00
Vladimir 'phcoder' Serbinenko
33e2e6f373 2010-03-06 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkrescue.in: Use mktemp with explicit template.
 2010-03-06 17:28:25 +01:00
Vladimir 'phcoder' Serbinenko
60b03859e8 2010-03-05 Vladimir Serbinenko <phcoder@gmail.com> 
* util/import_gcry.py: Add autogenerated files to MAINTAINER_CLEANFILES.
 2010-03-05 15:38:04 +01:00
Christian Franke
4760f97911 2010-03-04 Christian Franke <franke@computer.org> 
* util/grub-pe2elf.c: Add missing include "progname.h".
 2010-03-04 16:25:26 +01:00
Vladimir 'phcoder' Serbinenko
08dcd91370 2010-03-04 Vladimir Serbinenko <phcoder@gmail.com> 
* util/i386/efi/grub-install.in: Copy gettext files.
 2010-03-04 15:12:34 +01:00
Colin Watson
c6293875f9 reopen device when the requested access mode changes 2010-03-03 20:03:50 +00:00
Colin Watson
22d7b6137a 2010-03-03 Colin Watson <cjwatson@ubuntu.com> 
* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
	(grub_util_biosdisk_open): Initialise disk->data.
	(struct linux_partition_cache): New structure.
	(linux_find_partition): Cache partition start positions; these are
	expensive to compute on every read and write.
	(open_device): Cache open file descriptor in disk->data, so that we
	don't have to reopen it and flush the buffer cache for consecutive
	operations on the same device.
	(grub_util_biosdisk_close): New function.
	(grub_util_biosdisk_dev): Set `close' member.

	* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
	* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
	* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
	* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
 2010-03-03 10:44:12 +00:00
Vladimir 'phcoder' Serbinenko
14532662ee merge mainline into sparc-mkimage 2010-03-03 11:24:36 +01:00
Vladimir 'phcoder' Serbinenko
813a5f2d33 Init DDR2 controller 2010-03-01 18:53:34 +01:00
Vladimir 'phcoder' Serbinenko
72b286313a 2010-02-26 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub.d/10_linux.in (linux_entry): Don't default to
	gfxpayload=keep if Linux doesn't support video handover.
 2010-02-26 14:32:24 +01:00
Colin Watson
a0ca21c2d2 2010-02-25 Jordan Uggla <jordan.uggla@gmail.com> 
* util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
	* util/grub-mkconfig_lib.in (save_default_entry): Only save a new
	default entry if GRUB_SAVEDEFAULT=true.  This allows using
	GRUB_DEFAULT=saved on its own to let grub-reboot work, without
	saving a new default on every boot.
 2010-02-25 13:30:50 +00:00
carles
7dd05b96dc 2010-02-20 Carles Pina i Estany <carles@pina.cat> 
* util/grub-mkrawimage.c (usage): Change string formatting to
	improve gettext.
 2010-02-20 23:31:35 +00:00
Samuel Thibault
0a39de87d9 2010-02-14 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
	* util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.
 2010-02-18 08:56:31 +01:00
Vladimir 'phcoder' Serbinenko
d27859b2ec 2010-02-14 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Enclose
	set root in single quotes to prevent \, from being unescaped.
 2010-02-14 14:47:50 +01:00
Vladimir 'phcoder' Serbinenko
10f6389453 Fix raw image addresses 2010-02-13 18:48:33 +01:00
Vladimir 'phcoder' Serbinenko
0b4ab8e54a Merge mainline int sparc-mkimage-unify 2010-02-13 16:49:21 +01:00
Vladimir 'phcoder' Serbinenko
a49217cff7 aout image support 2010-02-13 16:26:50 +01:00
Vladimir 'phcoder' Serbinenko
bdca260795 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkrawimage.c (main): Call set_program_name.
 2010-02-13 15:57:42 +01:00
Vladimir 'phcoder' Serbinenko
da278c4d34 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
Properly align 64-bit targets.

	* util/grub-mkrawimage.c (ALIGN_ADDR): New macro.
	(generate_image): Use ALIGN_ADDR.
 2010-02-13 15:54:27 +01:00
Vladimir 'phcoder' Serbinenko
b274d734f3 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
Properly create cross-endian images.

	* include/grub/types.h (grub_host_to_target_addr): New macro
	* util/grub-mkrawimage.c (generate_image): Add missing host_to_target.
 2010-02-13 15:40:13 +01:00
Vladimir 'phcoder' Serbinenko
82da2062d8 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkrawimage.c (generate_image): Add forgotten ALIGN_UP.
 2010-02-13 15:25:37 +01:00
Vladimir 'phcoder' Serbinenko
6bea3f8983 merge sparc grub-mkimage into grub-mkrawimage 2010-02-12 20:08:56 +01:00
Vladimir 'phcoder' Serbinenko
65a533e78a 2010-02-10 Vladimir Serbinenko <phcoder@gmail.com> 
Support GRUB_GFXPAYLOAD_LINUX.

	* util/grub-mkconfig.in: Export GRUB_GFXPAYLOAD_LINUX.
	* util/grub.d/10_linux.in (linux_entry): Handle GRUB_GFXPAYLOAD_LINUX.
 2010-02-10 19:53:13 +01:00
Vladimir 'phcoder' Serbinenko
ca3112ba2d merge cleanbuild into emu-modload 2010-02-08 00:21:55 +01:00
Vladimir 'phcoder' Serbinenko
ec0be08d40 Clean building system 2010-02-07 23:49:49 +01:00
Vladimir 'phcoder' Serbinenko
7eed9925e2 missing files 2010-02-07 18:10:36 +01:00
Vladimir 'phcoder' Serbinenko
b77ab1aaa9 Merge emu-mod into emu-modload 2010-02-07 17:52:11 +01:00
Vladimir 'phcoder' Serbinenko
a1a8d38a58 Use nostdinc 2010-02-07 17:30:16 +01:00
Vladimir 'phcoder' Serbinenko
3dca5319c6 module support in grub-emu 2010-02-07 16:13:59 +01:00
Vladimir 'phcoder' Serbinenko
f38873b80b Build system support for grub-emu modules 2010-02-07 15:17:26 +01:00
BVK Chaitanya
09f38ecd5a fix remaining scripts 2010-02-07 10:31:04 +05:30
BVK Chaitanya
7a64e28d0e fixed mkconfig and mkrescue scripts 2010-02-07 10:14:50 +05:30
Vladimir 'phcoder' Serbinenko
2083672af1 Remove -DGRUB_UTIL when compiling grub-emu 2010-02-07 04:23:44 +01:00
Vladimir 'phcoder' Serbinenko
19a9fb834b merge mainline into emu-mod 2010-02-07 03:06:33 +01:00
Vladimir 'phcoder' Serbinenko
74e4934e1c 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
	(find_free_slot): Fix prototype.
	* util/getroot.c (grub_util_is_dmraid): Make static.
	* include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
	Add missing prototype.
	* util/sdl.c (grub_video_sdl_set_viewport): Remove.
 2010-02-07 02:47:18 +01:00
Vladimir 'phcoder' Serbinenko
f88d801b17 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
Fix warnings in grub-emu when compiling with maximum warning options.

	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
 2010-02-07 02:44:47 +01:00
Vladimir 'phcoder' Serbinenko
98e6959dea 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
Fix warnings in grub-emu when compiling with maximum warning options.

	* util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
	(grub_arch_modules_addr): Return 0 and not NULL.
	* util/misc.c (ENABLE_RELOCATABLE): New definition.
	(xstrdup): USe newstr instead of dup.
 2010-02-07 02:37:48 +01:00
Vladimir 'phcoder' Serbinenko
909301af11 First try at generating grub-emu from modules 2010-02-07 02:07:35 +01:00
Vladimir 'phcoder' Serbinenko
58548abbc3 Remove data member in partition structure 2010-02-07 01:48:38 +01:00
Vladimir 'phcoder' Serbinenko
8f891adc6f 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
	* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
	* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
	* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
 2010-02-07 00:52:31 +01:00
Vladimir 'phcoder' Serbinenko
85f90358b1 Remove part_ prefix 2010-02-06 19:33: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
BVK Chaitanya
1c1261d985 fixed grub-install.in 2010-02-06 14:29:42 +05:30
Vladimir 'phcoder' Serbinenko
1f534b6908 Merge mainline into gfxmenu 2010-02-03 01:24:07 +01:00
Vladimir 'phcoder' Serbinenko
2b4068e992 2010-02-03 Vladimir Serbinenko <phcoder@gmail.com> 
* util/hostdisk.c (open_device): Don't use partition device when reading
	before the partition.
	(grub_util_biosdisk_read): Don't read from partition and before the
	partition in single operation.
	(grub_util_biosdisk_write): Don't write to partition and before the
	partition in single operation.
 2010-02-03 00:49:35 +01:00
Colin Watson
b9c4f55b6f handle DM-RAID disks in convert_system_partition_to_system_disk 2010-01-31 19:37:37 +00:00
Christian Schmitt
bf7fcba2d7 2010-01-28 Christian Schmitt <chris@ilovelinux.de> 
* util/ieee1275/grub-install.in: Fix nvsetenv arguments.
 2010-01-28 23:10:37 +01:00
BVK Chaitanya
366e15ba86 sync with trunk 2010-01-28 21:48:15 +05:30
BVK Chaitanya
275d6f6bd4 fix grub-script-check 2010-01-28 21:43:28 +05:30
Colin Watson
2e1cb9bbbf 2010-01-28 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/10_linux.in: This script does not use any of the
	contents of gettext.sh, only the external command `gettext', so stop
	sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
	the same prefix as GRUB.)
	* util/grub.d/10_kfreebsd.in: Likewise.
 2010-01-28 12:49:40 +00:00
Robert Millan
27dea7eda4 2010-01-27 Robert Millan <rmh.grub@aybabtu.com> 
* util/hostfs.c: Include `<errno.h>'.
	(grub_hostfs_read): Handle errors from fseeko() and fread().
 2010-01-27 03:18:14 +00:00
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
b769a37b6e 2010-01-26 Colin Watson <cjwatson@ubuntu.com> 
* conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
	kern/err.c, kern/list.c, and kern/misc.c.
	* util/deviceiter.c [__linux__]: Define MINOR.
	(grub_util_iterate_devices): Add support for DM-RAID disk devices.
	* util/mkdevicemap.c (grub_putchar): New function.
	(grub_getkey): New function.
	(grub_refresh): New function.
	(main): Set debug=all if -v -v is used.
 2010-01-26 14:26:16 +00:00
Colin Watson
7181e2281f 2010-01-25 Colin Watson <cjwatson@ubuntu.com> 
* configure.ac: Check for Linux device-mapper support.
	* util/hostdisk.c (device_is_mapped): New function.
	(find_partition_start): New function, partly broken out from
	linux_find_partition and grub_util_biosdisk_get_grub_dev but with
	device-mapper support added.
	(linux_find_partition): Use find_partition_start.
	(convert_system_partition_to_system_disk): Add `st' argument.
	Support Linux /dev/mapper/* devices if device-mapper support is
	available; only DM-RAID devices are understood at present.
	(find_system_device): Add `st' argument.  Pass it to
	convert_system_partition_to_system_disk.
	(grub_util_biosdisk_get_grub_dev): Pass stat result to
	find_system_device and convert_system_partition_to_system_disk.  Use
	find_partition_start.
 2010-01-25 17:47:51 +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
BVK Chaitanya
10523df478 while and until loops support 2010-01-23 11:19:26 +05:30
BVK Chaitanya
4e6a305be4 for loop support to grub script 2010-01-23 11:03:41 +05:30
BVK Chaitanya
547e494f1b lexer-rewrite rebase commit 2010-01-22 19:07:27 +05:30
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
6419c43e4f Fix indentation in util/grub.d/00_header.in output 2010-01-20 13:56:45 +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
Vladimir 'phcoder' Serbinenko
b6aa46f5f5 merge gfxmenu into gfxmenu+multiterm 2010-01-18 16:38:13 +01: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
3b6f7ab75d Add missing menuviewer initialization. 2010-01-11 19:19:24 +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
Vladimir 'phcoder' Serbinenko
97ea65d432 Add mirroring and stacked combining marks 2010-01-07 21:25:56 +01:00
Robert Millan
c1b952d3d9 2010-01-07 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/10_hurd.in: Add --class information to menuentries.
	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
 2010-01-07 18:20:11 +00:00
Vladimir 'phcoder' Serbinenko
72f12cdcd9 Group combining diacritics 2010-01-07 16:37:53 +01: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
Vladimir 'phcoder' Serbinenko
89784252dc merge gfxmenu+multiterm into exp 2010-01-06 22:22:04 +01:00
Vladimir 'phcoder' Serbinenko
ec647fb940 Merge mainline into gfxmenu+multiterm 2010-01-06 22:19:52 +01:00
Vladimir 'phcoder' Serbinenko
f0cfb703b8 Initial bidi support for gfxmenu 2010-01-06 20:37:16 +01:00
Vladimir 'phcoder' Serbinenko
841353a2f9 merge gfxmenu into gfxmenu+multiterm 2010-01-05 21:25:03 +01:00
Vladimir 'phcoder' Serbinenko
eb1c959440 grub-mkconfig support for themes 2010-01-05 21:24:33 +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
Vladimir 'phcoder' Serbinenko
e6e86df1de Merge multiterm into gfxmenu+multiterm 2010-01-05 16:34:10 +01:00
Vladimir 'phcoder' Serbinenko
519634516f Merge mainline into multiterm 2010-01-05 16:27:41 +01:00
Colin Watson
a136811886 2010-01-05 Colin Watson <cjwatson@ubuntu.com> 
* util/mkisofs/write.c (padblock_write): Check return value of
	fread.
 2010-01-05 12:40:30 +00:00
Colin Watson
cf2fd2a6d1 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.
 2010-01-05 11:16:42 +00:00
Colin Watson
bc11fee9f5 merge from trunk 2010-01-05 10:53:03 +00:00
Colin Watson
5c23bb0f52 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.
 2010-01-05 10:41:51 +00:00
Colin Watson
fcab4f04e5 missing backslash 2010-01-05 10:39:30 +00:00
Colin Watson
b445cfaa4d 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).
 2010-01-05 10:30:14 +00:00
Robert Millan
7c30297857 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.
 2010-01-05 00:31:07 +00:00
Robert Millan
3a73dcb6f5 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.
 2010-01-03 22:34:03 +00:00
Robert Millan
58bc8bd5b1 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.
 2010-01-03 22:05:07 +00:00
Yves Blusseau
b1c10d4412 2009-01-01 Yves Blusseau <blusseau@zetam.org> 
* util/mkisofs/mkisofs.c: fix a warning about a bad cast when NLS
	is disabled
 2010-01-01 21:41:59 +01:00
Yves Blusseau
2f1a3acf75 2009-01-01 Yves Blusseau <yves.blusseau@zetam.org> 
* configure.ac: check external intl library
	* Makefile.in: add compiler and linker flags to properly compile with
	intl library
	* include/grub/i18n.h: add a check to disable NLS
	* util/misc.c (grub_util_init_nls): new function
	* include/grub/util/misc.h: likewise
	* util/elf/grub-mkimage.c: use the new function below to initialize NLS
	* 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-mkrelpath.c: likewise
	* util/grub-probe.c: likewise
	* util/i386/pc/grub-mkimage.c: likewise
	* util/i386/pc/grub-setup.c: likewise
	* util/sparc64/ieee1275/grub-mkimage.c: likewise
	* util/sparc64/ieee1275/grub-ofpathname.c: likewise
	* util/sparc64/ieee1275/grub-setup.c: likewise
	* util/mkisofs/mkisofs.h: add a check to disable NLS
	* util/mkisofs/mkisofs.c: likewise
 2010-01-01 21:32:30 +01:00
Vladimir 'phcoder' Serbinenko
ac0289ba92 grub-mkrescue for EFI (untested) 2009-12-29 11:24:13 +01:00
Vladimir 'phcoder' Serbinenko
8b442f3f4c asprintf and snprintf support 2009-12-29 10:04:06 +01:00
Vladimir 'phcoder' Serbinenko
94c201f714 Add forgotten config_opt parameter 2009-12-28 01:07:18 +01:00
Vladimir 'phcoder' Serbinenko
45a8e94c9c Ensure embeded config finishes with \0 2009-12-28 01:06:48 +01:00
Vladimir 'phcoder' Serbinenko
742e1f7e72 merge mainline into mips 2009-12-28 01:05:47 +01:00
Vladimir 'phcoder' Serbinenko
7f1f423cda merge multiterm gfxmenu+multiterm 2009-12-27 22:38:22 +01:00
Vladimir 'phcoder' Serbinenko
13d1f24696 Fix grub-emu compilation 2009-12-27 22:36:09 +01:00
Vladimir 'phcoder' Serbinenko
bee140683a Initial effort for gfxmenu on multiterm branch 2009-12-26 01:49:57 +01:00
Robert Millan
d94000ed13 Merge from trunk 2009-12-25 22:29:47 +00: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
9f293ab0df merge mainline into gfxmenu 2009-12-25 21:32:46 +01:00
Felix Zielcke
0ad46fd771 2009-12-25 Felix Zielcke <fzielcke@z-51.de> 
* util/hostdisk.c (open_device): Fix a comment.
 2009-12-25 18:29:17 +01:00
Robert Millan
427d6aa453 Merge my local branch 2009-12-25 12:43:20 +01:00
carles
61ba42be03 2009-12-25 Carles Pina i Estany <carles@pina.cat> 
* commands/efi/loadbios.c: Capitalize acronyms, replace `could not' by
	`couldn't' and `can not' by `cannot'.
	* commands/i386/pc/drivemap.c: Likewise.
	* disk/ata.c: Likewise.
	* disk/ieee1275/nand.c: Likewise.
	* fs/affs.c: Likewise.
	* fs/fat.c: Likewise.
	* fs/hfs.c: Likewise.
	* fs/hfsplus.c: Likewise.
	* fs/iso9660.c: Likewise.
	* fs/jfs.c: Likewise.
	* fs/minix.c: Likewise.
	* fs/reiserfs.c: Likewise.
	* fs/sfs.c: Likewise.
	* fs/udf.c: Likewise.
	* fs/ufs.c: Likewise.
	* fs/xfs.c: Likewise.
	* loader/powerpc/ieee1275/linux.c: Likewise.
	* loader/sparc64/ieee1275/linux.c: Likewise.
	* util/grub-probe.c: Likewise.
	* util/misc.c: Likewise.
 2009-12-25 01:04:51 +01:00
Vladimir 'phcoder' Serbinenko
4fc4ee303d Set default console on non-i386-pc 2009-12-25 00:13:03 +01:00
Robert Millan
d0e158c2f3 2009-12-24 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub-install.in (host_os): New variable.
	* util/i386/efi/grub-install.in (host_os): Likewise.
 2009-12-24 22:23:22 +00:00
Robert Millan
401c0ad6fd 2009-12-24 Robert Millan <rmh.grub@aybabtu.com> 
* util/mkisofs/write.c (padblock_write): Abort when given an
	excedingly large embed image, instead of silently truncating it.
 2009-12-24 18:00:48 +00:00
Robert Millan
8eca55a6eb Imported nyu's multi-input 2009-12-24 17:08:14 +01:00
Vladimir 'phcoder' Serbinenko
2e71383172 Core changes hopefully finished 2009-12-24 15:34:33 +01:00
Vladimir 'phcoder' Serbinenko
a2e77ce455 merge mainline into crypto 2009-12-23 20:34:26 +01:00
Vladimir 'phcoder' Serbinenko
0eb11149c9 eliminate dead code and data in des.c 2009-12-23 19:58:33 +01:00