Commit graph

1752 commits

Author SHA1 Message Date
Andrey Borzenkov
dea55e2a95 * util/getroot.c (pull_lvm_by_command): add --separator option
to vgs call to disable padding of output to 10 characters.
2013-08-14 20:40:39 +04:00
Vladimir 'phcoder' Serbinenko
7c9d0c39af Fix handling of build-time grub-bin2h and grub-mkfont when doing
full Canadian cross. Tested with build=x86_64, host=arm,
	target=ppc-ieee1275.
2013-08-14 10:56:55 +02:00
Colin Watson
36e87d25e1 * util/getroot.c (grub_util_biosdisk_get_grub_dev): Zero out
grub_errno in the case where we handle GRUB_ERR_UNKNOWN_DEVICE by
falling back to the partition device, otherwise a later call to this
function may fail spuriously.
Reported by Axel Beckert.  Fixes Debian bug #708614.
2013-08-13 17:48:56 +02:00
Colin Watson
c137aea04b * util/grub-mkconfig.in: Fix detection of Emacs autosave files. 2013-08-11 16:03:48 +02:00
Vladimir 'phcoder' Serbinenko
ae27e4d323 Merge mainline into arm 2013-07-16 18:43:43 +02:00
Andrey Borzenkov
f5ae3717e4 * util/grub-mknetdir.in: Remove stray line from help output. 2013-07-13 18:44:27 +04:00
Vladimir 'phcoder' Serbinenko
9c28da2a89 Remove early sm712 init as there is no reason for it (the "watchdog"
effect was due to wrong GPIO map).
2013-07-11 16:24:35 +02:00
Vladimir 'phcoder' Serbinenko
6f80a7b231 * util/grub-mkfont.c (write_font_ascii_bitmap): Fix handling of glyphs
not filling whole 8x16 space.
2013-07-11 13:50:18 +02:00
Paul Wise
eb272d84a4 * util/grub-reboot.in: Document submenu usage.
Also-By: Craig Sanders <savannah@taz.net.au>
2013-07-11 13:18:43 +02:00
Colin Watson
e639c204e0 * util/grub-script-check.c: Fail on scripts containing no
commands, to guard against corrupted grub-mkconfig setups that
produce no useful output.
* tests/grub_script_no_commands.in: New test.
* Makefile.util.def (grub_script_no_commands): Add.
Reported by Hans Putter.  Fixes Debian bug #713886.
2013-06-25 15:08:11 +01:00
Andrey Borzenkov
f25870887b * util/grub.d/30_os-prober.in: Add support for probing EFI
System Partition (as of os-prober 1.58).
2013-05-31 20:29:03 +04:00
Vladimir 'phcoder' Serbinenko
fc4c4fddf6 Detach optional parts of gfxterm and integrate in with coreboot init. 2013-05-31 00:42:33 +02:00
Vladimir 'phcoder' Serbinenko
2a800dc3f3 Remove libfdt 2013-05-17 13:58:47 +02:00
Vladimir 'phcoder' Serbinenko
50268344c0 * util/grub-install.in: Gettextize "Not found" message. 2013-05-11 15:54:22 +02:00
Vladimir 'phcoder' Serbinenko
62b15edfd1 Fix distfiles list.
Reported by: Andrey Borzenkov <arvidjaar@gmail.com>
2013-05-11 15:48:08 +02:00
Leif Lindholm
854f383c28 Move common function to dl_helper.c 2013-05-11 10:42:11 +02:00
Vladimir 'phcoder' Serbinenko
8e71d87482 merge mainline into arm 2013-05-11 10:24:24 +02:00
Vladimir 'phcoder' Serbinenko
30b03dc22e * util/grub-install.in: Handle efibootmgr presence check.
Reported by: Leif Lindholm.
2013-05-10 16:58:25 +02:00
Vladimir 'phcoder' Serbinenko
f8024c3f9a * util/grub-mkrescue.in: Replace STR' with STRING' to avoid adding
yet another string (pun intended) to translate.
2013-05-10 16:23:47 +02:00
Vladimir 'phcoder' Serbinenko
3e912fda81 * conf/Makefile.common: Poison float and double on non-emu. 2013-05-08 11:05:37 +02:00
Vladimir 'phcoder' Serbinenko
d22840ec12 Mark few forgotten strings for translation. 2013-05-07 11:41:47 +02:00
Andrey Borzenkov
5945c2f849 Reimplement grub-reboot to not depend on saved_entry. Use next_entry
variable for one time boot menu entry.
2013-05-06 22:13:34 +04:00
Vladimir 'phcoder' Serbinenko
5036166022 First automated video test (running videotest and comparing results) 2013-05-02 14:39:03 +02:00
Vladimir 'phcoder' Serbinenko
c53b4e67e4 Unify more code in grub-install_header. 2013-04-29 12:26:43 +02:00
Vladimir 'phcoder' Serbinenko
d417ddc4e4 Move --directory/--override-directorry to grub-install_header and unify. 2013-04-28 13:35:51 +02:00
Paulo Flabiano Smorigo
1dd70ebd58 * util/ieee1275/ofpath.c (of_path_of_scsi): Fix path output for sas
disks.
	(check_sas): Get sas_adress info.
2013-04-27 22:03:13 +02:00
Vladimir 'phcoder' Serbinenko
e7b8fd08c5 Core compression test. 2013-04-27 19:44:00 +02:00
Vladimir 'phcoder' Serbinenko
17f9fd29d3 Implement grub_machine_get_bootlocation for ARC. 2013-04-27 19:12:11 +02:00
Vladimir 'phcoder' Serbinenko
63314aa43c * util/getroot.c (exec_pipe): Put proper #if's so that its users don't
compile when not needed.
2013-04-26 23:41:13 +02:00
Vladimir 'phcoder' Serbinenko
c4b456d347 * util/grub-mkrescue.in: Rename i386-ieee1275 core image due to
ofw limited ISO support.
2013-04-26 11:27:24 +02:00
Vladimir 'phcoder' Serbinenko
7f63a64fa0 Enable mipsel-arc. 2013-04-25 22:42:35 +02:00
Vladimir 'phcoder' Serbinenko
eec3bb75e9 * util/grub-mkrescue.in: Fix loongson filename. 2013-04-25 02:14:46 +02:00
Vladimir 'phcoder' Serbinenko
e0810df35e * util/grub-mkrescue.in: Move all files that don't have a location
set in stone under /boot/grub. Use ISO hard links rather than copies
	to save some space.
2013-04-25 01:36:20 +02:00
Vladimir 'phcoder' Serbinenko
5e013e56f0 * util/grub-mkrescue.in: Alias sashARCS as sash. 2013-04-24 18:56:47 +02:00
Vladimir 'phcoder' Serbinenko
1a25e72cf6 * util/grub-install.in: Fix target fo qemu_mips.
Fix extension on EFI.
2013-04-24 15:10:29 +02:00
Vladimir 'phcoder' Serbinenko
ab1440bd4e * util/grub-mkrescue.in: Add mips-arc support. 2013-04-24 14:02:58 +02:00
Vladimir 'phcoder' Serbinenko
8528c879e3 Move mips-arc link address. Previous link address was chosen
in belief that RAM on SGI platforms grows down while in fact it
	grows up from an unusual base.
2013-04-24 13:54:17 +02:00
Andrey Borzenkov
4eafa17565 * util/grub.d/30_os-prober.in: Add onstr to linux entries in one
more place.
2013-04-19 12:08:46 +04:00
Vladimir 'phcoder' Serbinenko
daaa64bd90 Add support for pseries and other bootinfo machines to grub-mkrescue.
Tested by: Paulo Flabiano Smorigo.
2013-04-19 00:36:23 +02:00
Vladimir 'phcoder' Serbinenko
d0d2daa661 * util/grub-mkrescue.in: Add GPT for EFI boot. 2013-04-17 19:08:31 +02:00
Vladimir 'phcoder' Serbinenko
25fc51a879 Fix DMRAID partition handling. 2013-04-15 08:37:13 +02:00
Vladimir 'phcoder' Serbinenko
794515225f Add option to compress files on install/image creation. 2013-04-14 19:24:05 +02:00
Vladimir 'phcoder' Serbinenko
b49fe8792a Move GRUB out of system area when using xorriso 1.2.9 or later. 2013-04-14 18:53:14 +02:00
Vladimir 'phcoder' Serbinenko
8ca86b3a03 Support mkrescue on sparc64. 2013-04-14 17:10:55 +02:00
Vladimir 'phcoder' Serbinenko
07aec23c00 * util/grub-mkrescue.in: Fix wrong architecture for ppc dir. 2013-04-13 02:02:19 +02:00
Vladimir 'phcoder' Serbinenko
67ab83538f Better support Apple Intel Macs on CD. 2013-04-13 00:38:04 +02:00
Vladimir 'phcoder' Serbinenko
ba44ca6d1a Replace stpcpy with grub_stpcpy in tools. 2013-04-12 22:37:59 +02:00
Vladimir 'phcoder' Serbinenko
bbdd6305db Handle Japanese special keys.
Reported by: Hiroyuki YAMAMORI.
	Codes supplied by: Hiroyuki YAMAMORI.
2013-04-12 22:26:38 +02:00
Vladimir 'phcoder' Serbinenko
8573d302fc * util/grub-mkimage.c: Document memdisk implying --prefix. 2013-04-12 21:08:53 +02:00
Vladimir 'phcoder' Serbinenko
28af3d867c Relocations cleanup 2013-04-12 16:53:58 +02:00
Vladimir 'phcoder' Serbinenko
bc1cf01cf2 Add uboot header ourselves 2013-04-12 16:46:51 +02:00
Vladimir 'phcoder' Serbinenko
dbc56d8f0b Support i386-ieee1275 grub-mkrescue and make check on it. 2013-04-12 01:29:45 +02:00
Vladimir 'phcoder' Serbinenko
a79b8a1584 Merge powerpc grub-mkrescue flavour with common. Use xorriso HFS+
feature for it.
2013-04-11 23:15:26 +02:00
Andrey Borzenkov
f4b1fa4f3c * util/grub.d/30_os-prober.in: Add onstr to entries for visual
distinction.
2013-04-11 15:11:14 +02:00
Vladimir 'phcoder' Serbinenko
49818a594a Fix missing PVs if they don't contain "interesting" LV. Closes #38677.
Fix few warining messages and leaks while on it.
2013-04-11 00:08:27 +02:00
Vladimir 'phcoder' Serbinenko
d5e2a158e1 Fix ia64-efi image generation on big-endian machines. Deduplicate
some code while on it.
	Reported by: Leif Lindholm.
2013-04-09 19:19:19 +02:00
Leif Lindholm
389b31cd71 Initial import of Leif's work 2013-04-07 02:41:07 +02:00
Andrey Borzenkov
59624ca858 * util/grub-install_header: Use @PACKAGE@.mo in message catalog name
instead of hardcoding grub.mo.
2013-04-06 20:14:29 +02:00
Fedora Ninjas
1f44478c26 * util/grub.d/30_os-prober.in: Support btrrfs linux-prober extensions. 2013-04-05 14:55:37 +02:00
Vladimir 'phcoder' Serbinenko
132867de71 * util/grub-mkfont.c: Prefer enum to #define. 2013-04-05 11:13:37 +02:00
Francesco Lavra
c506fc3056 * util/grub-mkimage.c: Introduce new define EFI32_HEADER_SIZE. 2013-04-04 20:07:44 +02:00
Vladimir 'phcoder' Serbinenko
aa42823871 Unify file copying setup across different install scripts. Add
options for performing partial install.
2013-04-04 19:59:59 +02:00
Vladimir 'phcoder' Serbinenko
c962563095 * util/grub-setup.c (setup): Handle some corner cases. 2013-04-04 08:55:06 +02:00
Andrey Borzenkov
a7b1d6933b * util/grub-mount.c (fuse_init): Return error if fuse_main
failed.
2013-04-03 11:28:16 +02:00
Vladimir 'phcoder' Serbinenko
ff99babdfe * util/grub.d/20_linux_xen.in: Automatically add no-real-mode edd=off on
non-BIOS platforms.
2013-03-24 14:03:33 +01:00
Vladimir 'phcoder' Serbinenko
6ccd0b31c1 * util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Fix
handling of multi-device filesystems.
2013-03-24 13:11:19 +01:00
Vladimir 'phcoder' Serbinenko
774683685f Lift up core size limits on some platforms. Fix potential memory
corruption with big core on small memory systems. Document remaining
	limits.
2013-03-07 08:17:24 +01:00
Vladimir 'phcoder' Serbinenko
f9b7d78007 * util/grub-editenv.c (list_variables): Move print_var out of its
parent.
2013-03-01 13:52:05 +01:00
Vladimir 'phcoder' Serbinenko
6c69e691ca * util/grub-fstest.c: Remove nested functions. 2013-02-28 09:36:55 +01:00
Colin Watson
4eb8b75659 Remove nested functions from disk and file read hooks.
* include/grub/disk.h (grub_disk_read_hook_t): New type.
	(struct grub_disk): Add read_hook_data member.
	* include/grub/file.h (struct grub_file): Likewise.
	* include/grub/fshelp.h (grub_fshelp_read_file): Add read_hook_data
	argument.

	Update all callers.
2013-02-27 17:19:15 +01:00
Andrey Borzenkov
f81ef4b580 * util/grub-install.in: change misleading comment about
device.map creation
2013-01-27 16:17:21 +01:00
Colin Watson
7782b8a62f * util/grub-reboot.in (usage): Document the need for
GRUB_DEFAULT=saved.
* util/grub-set-default.in (usage): Likewise.
Reported by: Brian Candler.  Fixes Ubuntu bug #1102925.
2013-01-22 14:28:32 +00:00
Vladimir 'phcoder' Serbinenko
822b726b33 Improve spkmomdem reliability by adding a separator between bytes. 2013-01-21 14:55:30 +01:00
Colin Watson
fc524edf65 Remove nested functions from filesystem directory iterators.
* include/grub/fs.h (grub_fs_dir_hook_t): New type.
(struct grub_fs.dir): Add hook_data argument.

Update all implementations and callers.
2013-01-21 01:33:46 +00:00
Leif Lindholm
c821711f69 * util/grub-mkimage.c (main): Postpone freeing arguments.output
until after its use in generate_image.
2013-01-20 23:16:34 +00:00
Vladimir 'phcoder' Serbinenko
08dad2dcf9 * util/grub-script-check.c (main): Uniform the error message. 2013-01-20 22:05:55 +01:00
Colin Watson
25239370fd Remove nested functions from device iterators.
* include/grub/arc/arc.h (grub_arc_iterate_devs_hook_t): New type.
(grub_arc_iterate_devs): Add hook_data argument.
* include/grub/ata.h (grub_ata_dev_iterate_hook_t): New type.
(struct grub_ata_dev.iterate): Add hook_data argument.
* include/grub/device.h (grub_device_iterate_hook_t): New type.
(grub_device_iterate): Add hook_data argument.
* include/grub/disk.h (grub_disk_dev_iterate_hook_t): New type.
(struct grub_disk_dev.iterate): Add hook_data argument.
(grub_disk_dev_iterate): Likewise.
* include/grub/gpt_partition.h (grub_gpt_partition_map_iterate):
Likewise.
* include/grub/msdos_partition.h (grub_partition_msdos_iterate):
Likewise.
* include/grub/partition.h (grub_partition_iterate_hook_t): New
type.
(struct grub_partition_map.iterate): Add hook_data argument.
(grub_partition_iterate): Likewise.
* include/grub/scsi.h (grub_scsi_dev_iterate_hook_t): New type.
(struct grub_scsi_dev.iterate): Add hook_data argument.

Update all callers.
2013-01-20 15:52:15 +00:00
Vladimir 'phcoder' Serbinenko
600dc5f153 Add license header to spkmodem-recv.c. 2013-01-18 11:54:28 +01:00
Vladimir 'phcoder' Serbinenko
17334a6b6a Rewrite spkmodem to use PIT for timing. Double the speed. 2013-01-17 20:06:52 +01:00
Vladimir 'phcoder' Serbinenko
b78d6c32e3 New terminal outputs using serial: morse and spkmodem. 2013-01-16 20:39:54 +01:00
Colin Watson
09fd6d8293 Remove nested functions from script reading and parsing.
* grub-core/kern/parser.c (grub_parser_split_cmdline): Add
getline_data argument, passed to getline.
* grub-core/kern/rescue_parser.c (grub_rescue_parse_line): Add
getline_data argument, passed to grub_parser_split_cmdline.
* grub-core/script/lexer.c (grub_script_lexer_yywrap): Pass
lexerstate->getline_data to lexerstate->getline.
(grub_script_lexer_init): Add getline_data argument, saved in
lexerstate->getline_data.
* grub-core/script/main.c (grub_normal_parse_line): Add getline_data
argument, passed to grub_script_parse.
* grub-core/script/script.c (grub_script_parse): Add getline_data
argument, passed to grub_script_lexer_init.
* include/grub/parser.h (grub_parser_split_cmdline): Update
prototype.  Update all callers to pass appropriate getline data.
(struct grub_parser.parse_line): Likewise.
(grub_rescue_parse_line): Likewise.
* include/grub/reader.h (grub_reader_getline_t): Add void *
argument.
* include/grub/script_sh.h (struct grub_lexer_param): Add
getline_data member.
(grub_script_parse): Update prototype.  Update all callers to pass
appropriate getline data.
(grub_script_lexer_init): Likewise.
(grub_normal_parse_line): Likewise.

* grub-core/commands/legacycfg.c (legacy_file_getline): Add unused
data argument.
* grub-core/kern/parser.c (grub_parser_execute: getline): Make
static instead of nested.  Rename to ...
(grub_parser_execute_getline): ... this.
* grub-core/kern/rescue_reader.c (grub_rescue_read_line): Add unused
data argument.
* grub-core/normal/main.c (read_config_file: getline): Make static
instead of nested.  Rename to ...
(read_config_file_getline): ... this.
(grub_normal_read_line): Add unused data argument.
* grub-core/script/execute.c (grub_script_execute_sourcecode:
getline): Make static instead of nested.  Rename to ...
(grub_script_execute_sourcecode_getline): ... this.
* util/grub-script-check.c (main: get_config_line): Make static
instead of nested.
2013-01-15 12:03:25 +00:00
Vladimir 'phcoder' Serbinenko
22099030ad * grub-core/kern/emu/hostdisk.c (read_device_map): Explicitly
delimit path in strings using quotes.
	* util/getroot.c (grub_guess_root_devices): Likewise.
	(grub_make_system_path_relative_to_its_root): Likewise.
	* util/grub-probe.c (probe): Likewise.
	* util/ieee1275/ofpath.c (find_obppath): Likewise.
	(xrealpath): Likewise.
2013-01-13 22:45:16 +01:00
Vladimir 'phcoder' Serbinenko
4a9950ecb0 Fix compilation with older compilers.
* grub-core/Makefile.core.def (mpi): Add mpi-inline.c.
	* grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Remove redundant
	declarations.
	* grub-core/lib/posix_wrap/string.h: Include sys/types.h.
	* grub-core/lib/posix_wrap/sys/types.h: Add common types.
	* grub-core/lib/xzembed/xz_dec_lzma2.c (dict_put): Replace byte
	identifier with b.
	* grub-core/lib/xzembed/xz_dec_stream.c (dec_vli): Likewise.
	* include/grub/crypto.h: Add type defines.
	* util/import_gcrypth.sed: Remove duplicate type defines.
2013-01-13 21:06:25 +01:00
Colin Watson
a45289370a * util/grub-mkimage.c (generate_image): Fix "size of public key"
info message.
2013-01-13 01:47:46 +00:00
Vladimir 'phcoder' Serbinenko
4d7219f90b * autogen.sh: Do not try to delete nonexistant files.
* util/import_gcrypth.sed: Add some missing header removals.
2013-01-12 16:14:09 +01:00
Colin Watson
01323d49bf Clean up dangling references to grub-setup.
Fixes Ubuntu bug #1082045.

* docs/grub.texi (Images): Refer generally to grub-install rather
than directly to grub-setup.
(Installing GRUB using grub-install): Remove direct reference to
grub-setup.
(Device map) Likewise.
(Invoking grub-install): Likewise.
* docs/man/grub-install.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkimage.h2m (SEE ALSO): Likewise.
* util/grub-install.in (usage): Likewise.

* util/bash-completion.d/grub-completion.bash.in (_grub_setup):
Apply to grub-bios-setup and grub-sparc64-setup rather than to
grub-setup.
* configure.ac: Remove grub_setup output variable.

* docs/man/grub-bios-setup.h2m (NAME): Change name from grub-setup
to grub-bios-setup.
* docs/man/grub-sparc64-setup.h2m (NAME): Change name from
grub-setup to grub-sparc64-setup.
2013-01-12 13:30:37 +00:00
Vladimir 'phcoder' Serbinenko
5e3b8dcbb5 Import gcrypt public-key cryptography and implement signature checking. 2013-01-11 21:32:42 +01:00
Vladimir 'phcoder' Serbinenko
a4c3ed4c8f * util/grub.d/10_kfreebsd.in: Correct the patch to zpool.cache as it's
always in /boot/zfs.
	Reported by: Yuta Satoh.
2013-01-03 23:19:19 +01:00
Yuta Satoh
0b716507a1 * util/grub.d/10_kfreebsd.in: Fix improper references to grub-probe by
${grub_probe}
2013-01-03 23:06:07 +01:00
Colin Watson
608b647ad9 * util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text.
Fixes Savannah bug #37821.
2012-12-28 07:21:17 +00:00
Colin Watson
fd49ceb35c Apply program name transformations at build-time rather than at
run-time.  Fixes Debian bug #696465.

* acinclude.m4 (grub_TRANSFORM): New macro.
* configure.ac: Create output variables with transformed names for
most programs.
* util/bash-completion.d/grub-completion.bash.in: Use
pre-transformed variables for program names.
* util/grub-install.in: Likewise.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* tests/util/grub-shell-tester.in: Remove unused assignment.
* tests/util/grub-shell.in: Likewise.
* util/grub.d/00_header.in: Likewise.
2012-12-28 06:57:17 +00:00
Vladimir 'phcoder' Serbinenko
e3501b1306 * util/grub.d/20_linux_xen.in: Addmissing assignment to machine.
Reported by: Eriks Latosheks <foresterlv>.
2012-12-11 17:40:35 +01:00
Paulo Flabiano Smorigo
0f596201dc * util/grub-install.in: Follow the symbolic link parameter added
to the file command.
2012-12-10 17:07:01 +01:00
Andrey Borzenkov
600d5bdbf5 * util/grub-install.in: Remove stale TODO. 2012-12-10 17:00:56 +01:00
Vladimir Testov
b9f5ebd65c * util/grub-mkfont.c (argp_parser): Fix a typo which prevented --asce
from working.
2012-12-10 11:45:00 +01:00
Vladimir 'phcoder' Serbinenko
258f43b7d7 * util/getroot.c (convert_system_partition_to_system_disk): Support
nbd disks.
2012-12-10 11:12:38 +01:00
Grégoire Sutre
03711240c8 Fix ordering and tab indentation of NetBSD boot menu entries. 2012-10-28 11:55:22 +01:00
Colin Watson
0d35da3f2b * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Redirect
errors from grub-probe to /dev/null, not stdout.
2012-09-26 13:12:20 +01:00
Colin Watson
473959f052 * util/grub-install.in: Make the error message if $source_dir
doesn't exist more useful.
2012-09-24 18:50:35 +01:00
Colin Watson
794c8c3375 Fix grub-emu build on FreeBSD.
* Makefile.util.def (grub-mount): Add LIBGEOM to ldadd.
* grub-core/net/drivers/emu/emunet.c: Only include Linux-specific
headers on Linux.
(GRUB_MOD_INIT): Return immediately on non-Linux platforms; this
implementation is currently Linux-specific.
* util/getroot.c (exec_pipe): Define only on Linux or when either
libzfs or libnvpair is unavailable.
(find_root_devices_from_poolname): Remove unused path variable.
2012-09-22 21:19:58 +01:00