Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 14:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,398 Commits 28 Branches 23 Tags
0480665b9de31aefc7f1d95448efdf8349997fe9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Watson 0480665b9d On Linux, read partition start offsets from sysfs if possible 
This lets us cope with block device drivers that don't implement
HDIO_GETGEO.  Fixes Ubuntu bug #1237519.

* grub-core/osdep/linux/hostdisk.c (sysfs_partition_path): New
function.
(sysfs_partition_start): Likewise.
(grub_util_find_partition_start_os): Try sysfs_partition_start
before HDIO_GETGEO.
 2013-12-05 13:51:52 +00:00
Colin Watson 3a82f8bb48 Fix grub-shell to avoid breaking "make distcheck" 
Copying the themes directory in grub-shell isn't
parallel-test-friendly and breaks on the second test when the source
directory is read-only (as in "make distcheck").  Instead, add a
hidden --themes-directory option to grub-mkrescue et al, and use it
in grub-shell.
 2013-12-04 13:36:34 +00:00
Colin Watson 0c0eab527f * grub-core/Makefile.core.def (setjmp): Distribute 
lib/arm64/setjmp.S.
 2013-12-03 18:11:18 +00:00
Colin Watson 44d4884779 Merge branch 'cjwatson/timeout-style' 2013-12-03 16:15:45 +00:00
Colin Watson 10955cda06 Credit and bug reference. 2013-12-03 16:14:01 +00:00
Colin Watson f315b508ae Reduce nesting level. 2013-12-03 16:11:00 +00:00
Colin Watson f70ab525f9 Remove a few references to GRUB_HIDDEN_TIMEOUT* 
Reported by Andrey Borzenkov.
 2013-11-29 17:19:37 +00:00
Colin Watson 9b70860ecc Consolidate timeout generation code a bit. 2013-11-29 16:11:53 +00:00
Colin Watson 095588ef34 Consistently ignore GRUB_TIMEOUT if GRUB_HIDDEN_TIMEOUT is set 
Pointed out by Vladimir Serbinenko.
 2013-11-29 15:30:44 +00:00
Colin Watson 2dbda2215c Fix documentation of behaviour after pressing ESC 
Pointed out by Andrey Borzenkov.
 2013-11-29 15:25:43 +00:00
Colin Watson 53cc63bf85 Add GRUB_TIMEOUT_STYLE_BUTTON support 
Suggested by Vladimir Serbinenko.
 2013-11-29 15:18:05 +00:00
Colin Watson 471b2683e7 Move deprecated grub-mkconfig options to a separate table 
Suggested by Andrey Borzenkov.
 2013-11-29 14:59:25 +00:00
Colin Watson 8ddf84bfb8 Fix "make -C docs dvi" 
* docs/grub-dev.texi (Font Metrics): Exclude @image command from DVI
builds, since we don't have an EPS version of font_char_metrics.png.
Add leading dot to image extension per the Texinfo documentation.
 2013-11-29 13:48:23 +00:00
Colin Watson fd0df6d098 Fix build with FreeType 2.5.1 
* util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
<freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
* util/grub-gen-widthspec.c: Likewise.
* util/grub-mkfont.c: Likewise.
 2013-11-29 12:19:36 +00:00
Colin Watson 827d87e9d6 Fix documentation of timeout expiry. 2013-11-28 11:01:53 +00:00
Colin Watson 8f236c1419 Revamp hidden timeout handling 
Add a new timeout_style environment variable and a corresponding
GRUB_TIMEOUT_STYLE configuration key for grub-mkconfig.  This
controls hidden-timeout handling more simply than the previous
arrangements, and pressing any hotkeys associated with menu entries
during the hidden timeout will now boot the corresponding menu entry
immediately.

GRUB_HIDDEN_TIMEOUT=<non-empty> + GRUB_TIMEOUT=<non-zero> now
generates a warning, and if it shows the menu it will do so as if
the second timeout were not present.  Other combinations are
translated into reasonable equivalents.
 2013-11-28 02:29:15 +00:00
Colin Watson 16ef26fd3a * grub-core/osdep/unix/exec.c (grub_util_exec_redirect): Remove 
references to mdadm from otherwise generic code.
(grub_util_exec_pipe): Likewise.
(grub_util_exec_pipe_stderr): Likewise.
* grub-core/osdep/unix/getroot.c (grub_util_pull_lvm_by_command):
This function calls vgs, not mdadm; adjust variable names
accordingly.
 2013-11-27 11:22:31 +00:00
Colin Watson cf8c80ff77 Merge branch 'new-autogen' 2013-11-27 10:57:27 +00:00
Colin Watson 5c7206e45e Speed up test suite by avoiding fsync 
Add grub_util_disable_fd_syncs call to turn grub_util_fd_sync calls into
no-ops, and use it in programs that copy files but do not need to take
special care to sync writes (grub-mknetdir, grub-rescue,
grub-mkstandalone).

On my laptop, this reduces partmap_test's runtime from 1236 seconds to
204 seconds.
 2013-11-27 10:10:22 +00:00
Colin Watson fc3f2b72cd * tests/util/grub-fs-tester.in: Execute xorriso from $PATH rather 
than hardcoding /usr/local/bin/xorriso.
 2013-11-26 23:51:48 +00:00
Colin Watson 34b2003def Handle #if/#endif and C-style comments in AutoGen definitions files. 2013-11-26 17:48:20 +00:00
Colin Watson 7e90f5ad25 Show file name in error messages from AutogenParser. 2013-11-26 17:42:56 +00:00
Colin Watson ab4f15013a Generate Makefile.*.am directly from gentpl.py, eliminating the use of Autogen. The Autogen definitions files remain intact as they offer a useful abstraction. 2013-11-26 17:13:01 +00:00
Colin Watson 07e3b04742 Add a --locale-directory option to grub-install and related tools. 
* include/grub/util/install.h (GRUB_INSTALL_OPTIONS): Add
--locale-directory option.
(enum grub_install_options): Add
GRUB_INSTALL_OPTIONS_LOCALE_DIRECTORY.
* util/grub-install-common.c (grub_install_help_filter): Handle
GRUB_INSTALL_OPTIONS_LOCALE_DIRECTORY.
(grub_install_parse): Likewise.
(get_localedir): New function to check for a user-provided option
before trying grub_util_get_localedir.
(copy_locales): Use get_localedir rather than
grub_util_get_localedir.  Handle differing locale directory layouts.
(grub_install_copy_files): Likewise.
 2013-11-25 18:04:50 +00:00
Colin Watson c6a823e267 * util/grub-mkrescue.c (main): If a source directory is not 
specified, read platform-specific files from subdirectories of
pkglibdir, not pkgdatadir.
 2013-11-21 17:36:45 +00:00
Colin Watson b7f9aedfac * grub-core/normal/progress.c: Remove unused file. 2013-11-21 15:37:57 +00:00
Colin Watson 4e7d433dfb * Makefile.util.def (grub-mkimage): Add 
grub-core/osdep/aros/config.c to extra_dist.
* conf/Makefile.extra-dist (EXTRA_DIST): Add docs/autoiso.cfg,
docs/osdetect.cfg, grub-core/gnulib-fix-null-deref.diff,
grub-core/gnulib-fix-width.diff, grub-core/gnulib-no-abort.diff, and
grub-core/gnulib-no-gets.diff.
 2013-11-19 20:39:16 +00:00
Colin Watson a8c3e5e3c7 * util/grub-install.c (main): Adjust info messages to match 
installed paths of grub-bios-setup and grub-sparc64-setup.
 2013-11-19 18:43:05 +00:00
Colin Watson 4402db3ecc * util/grub-install-common.c (copy_locales): Consistently use 
grub_util_get_localedir () rather than LOCALEDIR.
(grub_install_copy_files): Likewise.
 2013-11-19 15:35:44 +00:00
Colin Watson 60870be86c * tests/gzcompress_test.in: Skip if gzip is not installed (unlikely, 
but for symmetry).
* tests/lzocompress_test.in: Skip if lzop is not installed.
* tests/xzcompress_test.in: Skip if xz is not installed.
 2013-11-18 16:16:33 +00:00
Colin Watson a1f00cc557 * util/grub-mkrescue.c (main): Fix typo. 2013-11-18 15:30:47 +00:00
Colin Watson 1e8e2e78a5 * tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo 
files have not been built.
 2013-11-18 14:02:11 +00:00
Colin Watson 3bf4088b8b * grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file): 
Handle errors from mkstemp.
(grub_util_make_temporary_dir): Handle errors from mkdtemp.
 2013-11-18 12:27:44 +00:00
Colin Watson 59ba9d147f * .gitignore: Only ignore grub-mk* at the top level. 2013-11-15 16:25:05 +00:00
Colin Watson 23012db921 * util/grub-reboot.in (usage): Fix a typo. 2013-11-15 14:32:03 +00:00
Colin Watson 0de172a0c0 * util/grub-install_header: Set localedir here, since this file is 
where it's used.
* util/grub-install.in: Remove setting of localedir.
* util/grub-mkrescue.in: Likewise.
 2013-11-14 16:45:27 +00:00
Colin Watson 1326b9ae2a * util/getroot.c (grub_util_biosdisk_get_grub_dev) [__GNU__]: Remove 
unused variables.
 2013-11-14 15:08:37 +00:00
Colin Watson 5da5517288 * grub-core/fs/ext2.c (grub_ext2_read_block): Factor out common code for indirect block handling. 
Saves 185 bytes on compressed image.
 2013-11-14 08:13:06 +00:00
Colin Watson 6fe506b04b * configure.ac (AM_INIT_AUTOMAKE): Require at least version 1.10.1, 
to match INSTALL.
 2013-11-13 14:57:12 +00:00
Colin Watson 81a2e438dc * grub-core/kern/misc.c: Don't redirect divisions in the 
GRUB_UTIL case.
* include/grub/misc.h: Likewise.
 2013-11-13 14:47:23 +00:00
Colin Watson 9b45c0733e * grub-core/osdep/unix/emuconsole.c (put): Pacify the compiler on 
systems that require checking the return value of write.
 2013-11-13 13:34:57 +00:00
Colin Watson 11b2a9b70b * util/grub-install.in (efi_quiet): Fix inverted logic: make 
efibootmgr quiet when --debug is not used, rather than when it is.
 2013-11-13 13:05:39 +00:00
Colin Watson d743d22de6 * gentpl.py (define_macro_for_platform_dependencies): Remove 
first (and thus unused) of two definitions for this function.
(platform_dependencies): Likewise.
 2013-11-13 12:46:37 +00:00
Colin Watson 11da14b548 * acinclude.m4 (grub_apple_cc): Remove; since the removal of nested 
functions, we only need to check this for the target, not the host.
* configure.ac (grub_apple_cc): Likewise.
 2013-11-13 12:01:39 +00:00
Colin Watson d0d1e3dacb * util/grub-editenv.c (help_filter, argp): Document how to delete 
the whole environment block.
Reported by Dan Jacobson.  Fixes Debian bug #726265.
 2013-11-13 02:15:57 +00:00
Colin Watson 3809f0163b * docs/grub.texi (Internationalisation, Supported kernels): Fix 
sectioning.
 2013-11-13 02:08:50 +00:00
Colin Watson 607319c9ab * grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name_iter): 
Remove no-longer-true __attribute__ ((unused)) on disk parameter.
 2013-09-18 15:43:58 +01: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
Colin Watson a9e5abee0f * .bzrignore: Update with a number of new test-related files. 2013-06-25 15:32:36 +01: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
Colin Watson 33028f4c0b * grub-core/commands/acpihalt.c (skip_ext_op): Add support for 
skipping Event, Device, Processor, PowerRes, ThermalZone, and
	  BankField extended opcodes.
	  (get_sleep_type): Add minimal scope handling (just enough to
	  handle setting the scope to the root path).
	  (grub_acpi_halt): Parse any SSDTs as well as the DSDT.
	* include/grub/acpi.h: Add enumeration values for Event, Device,
	  Processor, PowerRes, ThermalZone, and BankField extended opcodes.
 2013-03-26 11:29:52 +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
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
Colin Watson d44892fed9 * grub-core/font/font.c (blit_comb: do_blit): Make static instead of 
nested.
(blit_comb: add_device_width): Likewise.
 2013-01-21 21:03:26 +00:00
Colin Watson 5fdbaed168 Remove nested functions from USB iterators. 
* include/grub/usb.h (grub_usb_iterate_hook_t): New type.
(grub_usb_controller_iterate_hook_t): Likewise.
(grub_usb_iterate): Add hook_data argument.
(grub_usb_controller_iterate): Likewise.
(struct grub_usb_controller_dev.iterate): Likewise.

Update all implementations and callers.
 2013-01-21 21:02:24 +00:00
Colin Watson ed12a00309 Fix powerpc and sparc64 build failures caused by un-nesting memory 
map iterators.
 2013-01-21 14:41:06 +00:00
Colin Watson 6a0db4492c * grub-core/disk/arc/arcdisk.c (grub_arcdisk_iterate): Fix 
parameter declarations.
 2013-01-21 13:59:28 +00:00
Colin Watson 115c2cc180 * grub-core/partmap/msdos.c (embed_signatures): Add the signature of 
an Acer registration utility with several sightings in the wild.
Reported by: Rickard Westman.  Fixes Ubuntu bug #987022.
 2013-01-21 11:10:25 +00: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
Colin Watson 53d3e4e3df * docs/grub.texi (Multi-boot manual config): Fix typo for 
"recommended".
 2013-01-21 00:05:41 +00:00
Colin Watson 6a0debbd91 * grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the 
initrd size to addr_min, since the initrd will be allocated after
this address.
 2013-01-20 23:03:35 +00:00
Colin Watson 6c724b85b4 Remove nested functions from ELF iterators. 2013-01-20 15:54:09 +00: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
Colin Watson 6c0314d638 Fix typos for "developer" and "development". 2013-01-20 13:24:47 +00: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
Colin Watson d0d4b8a063 Remove nested functions from memory map iterators. 
* grub-core/efiemu/mm.c (grub_efiemu_mmap_iterate): Add hook_data
argument, passed to hook.
* grub-core/kern/i386/coreboot/mmap.c
(grub_linuxbios_table_iterate): Likewise.
(grub_machine_mmap_iterate: iterate_linuxbios_table): Make static
instead of nested.
(grub_machine_mmap_iterate): Add hook_data argument.
* grub-core/kern/i386/multiboot_mmap.c (grub_machine_mmap_iterate):
Add hook_data argument, passed to hook.
* grub-core/kern/i386/pc/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/i386/qemu/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/ieee1275/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/arc/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/loongson/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/qemu_mips/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/mmap/efi/mmap.c (grub_efi_mmap_iterate): Likewise.
(grub_machine_mmap_iterate): Likewise.
* grub-core/mmap/mmap.c (grub_mmap_iterate): Likewise.
* include/grub/efiemu/efiemu.h (grub_efiemu_mmap_iterate): Update
prototype.
* include/grub/memory.h (grub_memory_hook_t): Add data argument.
Remove NESTED_FUNC_ATTR from here and from all users.
(grub_mmap_iterate): Update prototype.
(grub_efi_mmap_iterate): Update prototype.  Update all callers to
pass appropriate hook data.
(grub_machine_mmap_iterate): Likewise.

* grub-core/commands/acpi.c (grub_acpi_create_ebda: find_hook): Make
static instead of nested.
* grub-core/commands/lsmmap.c (grub_cmd_lsmmap: hook): Likewise.
Rename to ...
(lsmmap_hook): ... this.
* grub-core/efiemu/mm.c (grub_efiemu_mmap_init: bounds_hook):
Likewise.
(grub_efiemu_mmap_fill: fill_hook): Likewise.
* grub-core/kern/i386/coreboot/init.c (grub_machine_init:
heap_init): Likewise.
* grub-core/kern/i386/pc/init.c (grub_machine_init: hook): Likewise.
Rename to ...
(mmap_iterate_hook): ... this.
* grub-core/kern/ieee1275/init.c (grub_claim_heap: heap_init):
Likewise.
* grub-core/lib/ieee1275/relocator.c
(grub_relocator_firmware_get_max_events: count): Likewise.
(grub_relocator_firmware_fill_events: fill): Likewise.  Rename
to ...
(grub_relocator_firmware_fill_events_iter): ... this.
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align:
hook): Likewise.  Rename to ...
(grub_relocator_alloc_chunk_align_iter): ... this.
* grub-core/loader/i386/bsd.c (generate_e820_mmap: hook): Likewise.
Rename to ...
(generate_e820_mmap_iter): ... this.
* grub-core/loader/i386/linux.c (find_mmap_size: hook): Likewise.
Rename to ...
(count_hook): ... this.
(grub_linux_boot: hook): Likewise.  Rename to ...
(grub_linux_boot_mmap_find): ... this.
(grub_linux_boot: hook_fill): Likewise.  Rename to ...
(grub_linux_boot_mmap_fill): ... this.
* grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap:
hook): Likewise.  Rename to ...
(grub_fill_multiboot_mmap_iter): ... this.
* grub-core/loader/multiboot.c (grub_get_multiboot_mmap_count:
hook): Likewise.  Rename to ...
(count_hook): ... this.
* grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap:
hook): Likewise.  Rename to ...
(grub_fill_multiboot_mmap_iter): ... this.
* grub-core/loader/powerpc/ieee1275/linux.c
(grub_linux_claimmap_iterate: alloc_mem): Likewise.
* grub-core/loader/sparc64/ieee1275/linux.c (alloc_phys: choose):
Likewise.  Rename to ...
(alloc_phys_choose): ... this.
(determine_phys_base: get_physbase): Likewise.
* grub-core/mmap/i386/mmap.c (grub_mmap_malign_and_register:
find_hook): Likewise.
* grub-core/mmap/i386/pc/mmap.c (preboot: fill_hook): Likewise.
(malloc_hook: count_hook): Likewise.
* grub-core/mmap/i386/uppermem.c (grub_mmap_get_lower: hook):
Likewise.  Rename to ...
(lower_hook): ... this.
(grub_mmap_get_upper: hook): Likewise.  Rename to ...
(upper_hook): ... this.
(grub_mmap_get_post64: hook): Likewise.  Rename to ...
(post64_hook): ... this.
* grub-core/mmap/mips/uppermem.c (grub_mmap_get_lower: hook):
Likewise.  Rename to ...
(lower_hook): ... this.
(grub_mmap_get_upper: hook): Likewise.  Rename to ...
(upper_hook): ... this.
* grub-core/mmap/mmap.c (grub_mmap_iterate: count_hook): Likewise.
(grub_mmap_iterate: fill_hook): Likewise.
(fill_mask): Pass addr and mask within a single struct.
(grub_cmd_badram: hook): Make static instead of nested.  Rename
to ...
(badram_iter): ... this.
(grub_cmd_cutmem: hook): Likewise.  Rename to ...
(cutmem_iter): ... this.
 2013-01-15 12:02:35 +00: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
Colin Watson ca3a74469a Remove nested functions from PCI iterators. 
* grub-core/bus/pci.c (grub_pci_iterate): Add hook_data argument,
passed to hook.  Update all callers to pass appropriate hook data.
* grub-core/bus/emu/pci.c (grub_pci_iterate): Likewise.
* include/grub/pci.h (grub_pci_iteratefunc_t): Add data argument.
Remove NESTED_FUNC_ATTR from here and from all users.
(grub_pci_iterate): Update prototype.
* grub-core/bus/cs5536.c (grub_cs5536_find: hook): Make static
instead of nested.  Rename to ...
(grub_cs5536_find_iter): ... this.
* grub-core/kern/efi/mm.c (stop_broadcom: find_card): Likewise.
* grub-core/kern/mips/loongson/init.c (init_pci: set_card):
Likewise.
* grub-core/kern/vga_init.c (grub_qemu_init_cirrus: find_card):
Likewise.
* grub-core/video/bochs.c (grub_video_bochs_setup: find_card):
Likewise.
* grub-core/video/cirrus.c (grub_video_cirrus_setup: find_card):
Likewise.
* grub-core/video/efi_uga.c (find_framebuf: find_card): Likewise.
* grub-core/video/radeon_fuloong2e.c
(grub_video_radeon_fuloong2e_setup: find_card): Likewise.
* grub-core/video/sis315pro.c (grub_video_sis315pro_setup:
find_card): Likewise.
* grub-core/video/sm712.c (grub_video_sm712_setup: find_card):
Likewise.
 2013-01-13 01:10:41 +00: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
Colin Watson f8861eaf9f * grub-core/io/bufio.c (grub_bufio_open): Use grub_zalloc instead of 
explicitly zeroing elements.
* grub-core/io/gzio.c (grub_gzio_open): Likewise.
* grub-core/io/lzopio.c (grub_lzopio_open): Remove explicit zeroing
of elements in a structure already allocated using grub_zalloc.
* grub-core/io/xzio.c (grub_xzio_open): Likewise.
 2013-01-07 10:45:05 +00:00
Colin Watson 86065b0ad6 * docs/grub.texi (grub_cpu): New subsection. 
(grub_platform): Likewise.
 2013-01-07 10:43:00 +00:00
Colin Watson 54ce53cadc * docs/grub.texi (Invoking grub-mkrelpath): New section. 
(Invoking grub-script-check): Likewise.
 2013-01-03 10:53:53 +00:00
Colin Watson 8912efca03 * docs/grub.texi (Invoking grub-mount): New section. 
Reported by: Filipus Klutiero.  Fixes Debian bug #666427.
 2013-01-03 10:32:57 +00:00
Colin Watson c3fc8394a0 * grub-core/tests/lib/test.c (grub_test_run): Return non-zero on 
test failures, so that a failing unit test correctly causes 'make
check' to fail.
 2013-01-02 16:42:48 +00:00
Colin Watson 45d26abb40 Fix failing printf test. 
* grub-core/kern/misc.c (grub_vsnprintf_real): Parse '-', '.', and
'$' in the correct order when collecting type information.
 2013-01-02 12:48:31 +00:00
Colin Watson 971dd2c6d5 * docs/grub.texi (configfile): Explain environment variable 
handling.
(source): New section.
Reported by: Arbiel Perlacremaz.  Fixes Savannah bug #35564.
 2013-01-02 09:29:48 +00:00
Colin Watson 5c67ea6cd9 Remove several trivially-unnecessary uses of nested functions. 
* grub-core/commands/i386/pc/sendkey.c
(grub_cmd_sendkey: find_key_code, find_ascii_code): Make static
instead of nested.
* grub-core/commands/legacycfg.c (legacy_file: getline): Likewise.
Rename to ...
(legacy_file_getline): ... this.
* grub-core/commands/loadenv.c (grub_cmd_load_env: set_var):
Likewise.
* grub-core/kern/corecmd.c (grub_core_cmd_set: print_env): Likewise.
* grub-core/kern/fs.c (grub_fs_probe: dummy_func): Likewise.  Rename
to ...
(probe_dummy_iter): ... this.
* grub-core/kern/i386/coreboot/mmap.c
(grub_linuxbios_table_iterate: check_signature): Likewise.
* grub-core/kern/parser.c (grub_parser_split_cmdline:
check_varstate): Likewise.  Mark inline.
* grub-core/lib/arg.c (find_short: fnd_short): Likewise.  Pass
an additional parameter.
(find_long: fnd_long): Likewise.  Pass two additional parameters.
* grub-core/lib/crc.c (init_crc32c_table: reflect): Likewise.
* grub-core/lib/crc64.c (init_crc64_table: reflect): Likewise.
* grub-core/lib/ieee1275/cmos.c (grub_cmos_find_port: hook):
Likewise.  Rename to ...
(grub_cmos_find_port_iter): ... this.
* grub-core/lib/ieee1275/datetime.c (find_rtc: hook): Likewise.
Rename to ...
(find_rtc_iter): ... this.

* grub-core/normal/menu_entry.c (run): Fold nested editor_getsource
function directly into the function body, since it is only called
once.
 2012-12-31 17:31:38 +00:00
Colin Watson 33a68ac643 * grub-core/bus/usb/ehci.c (grub_ehci_pci_iter): Remove incorrect 
__attribute__ ((unused)).
* grub-core/video/bochs.c (find_card): Likewise.
* grub-core/video/cirrus.c (find_card): Likewise.
* grub-core/video/radeon_fuloong2e.c (find_card): Likewise.
* grub-core/video/sis315pro.c (find_card): Likewise.
* grub-core/video/sm712.c (find_card): Likewise.
 2012-12-30 09:57:58 +00: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 fc6171d58e neater gnulib backport 2012-12-28 07:13:34 +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
Colin Watson 7024b3c0c2 Backport gnulib fixes for C11. Fixes Savannah bug #37738. 
* grub-core/gnulib/stdio.in.h (gets): Warn on use only if
HAVE_RAW_DECL_GETS.
* m4/stdio_h.m4 (gl_STDIO_H): Check for gets.
 2012-12-28 06:43:35 +00:00
Colin Watson e8a5d5d4da * grub-core/commands/configfile.c (GRUB_MOD_INIT): Correct 
description of extract_entries_configfile.
 2012-10-12 15:34:33 +01:00
Colin Watson 39525c22be * grub-core/loader/i386/linux.c (allocate_pages): Fix spelling of 
preferred_address.
(grub_cmd_linux): Likewise.
* grub-core/net/icmp6.c (struct prefix_option): Fix spelling of
preferred_lifetime.  Update all users.
 2012-10-05 13:09:19 +01:00
Colin Watson 288c757d70 * Makefile.util.def (grub-mknetdir): Move to $prefix/bin. 
Reported by: Daniel Kahn Gillmor.  Fixes Debian bug #688799.
 2012-09-26 13:51:13 +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
Colin Watson 86d08fdb18 * grub-core/partmap/msdos.c (pc_partition_map_embed): Revert 
incorrect off-by-one fix from 2011-02-12.  A 62-sector core image
should fit before end == 63.
 2012-09-19 02:44:54 +01:00
Colin Watson 735abf545c * util/grub-setup.c (write_rootdev): Remove unused core_img 
parameter.  Update all callers.
(setup): Define core_sectors only if GRUB_SETUP_BIOS, to appease
'gcc -Wunused-but-set-variable'.  Remove unnecessary nested #ifdef
GRUB_SETUP_BIOS.
 2012-09-19 02:41:51 +01:00
Colin Watson a2fc392426 * util/grub-mkconfig_lib.in (grub_quote): Remove outdated sentence 
from comment.
 2012-09-17 16:58:50 +01:00
Colin Watson dfd39dbdea * grub-core/term/terminfo.c: Only fix up powerpc key repeat on 
IEEE1275 machines.  Fixes powerpc-emu compilation.
* include/grub/terminfo.h: Likewise.
 2012-09-14 11:23:36 +01:00
Colin Watson f0f5575291 * NEWS: Fix typo. 2012-09-05 13:55:54 +01:00
Colin Watson ecadc4c2c4 * util/import_gcry.py: Sort cipher_files, to make build system 
generation more deterministic.
 2012-09-05 09:00:39 +01:00
Colin Watson 265c162a28 * Makefile.am (EXTRA_DIST): Add linguas.sh. It's only strictly 
required for checkouts from bzr, but it may be useful for users or
distributors wishing to update translations against a tarball
distribution, and it can be helpful for the tarball to be a superset
of what's in bzr.
 2012-09-04 23:35:38 +01:00
Colin Watson 3d171e951a * Makefile.am (EXTRA_DIST): Add 
grub-core/tests/boot/linux.init-mips.S,
grub-core/tests/boot/linux.init-ppc.S, and
grub-core/tests/boot/linux-ppc.cfg.
 2012-09-04 18:59:41 +01:00
Colin Watson f2c2503eab * grub-core/mmap/mips/loongson: Remove empty directory. 2012-09-04 18:56:13 +01:00
Colin Watson dd77d2be32 * docs/man/grub-mkdevicemap.h2m: Remove, since grub-mkdevicemap is 
gone.
 2012-09-04 18:39:40 +01:00
Colin Watson ab2163d5da * .bzrignore: Add grub-bios-setup, grub-ofpathname, and 
grub-sparc64-setup.
 2012-09-04 18:33:33 +01:00