Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 06:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,193 Commits 28 Branches 23 Tags
7ede8f8b5b62f7244f3cc9e9e6927cac43df006b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Watson e74c31125d * util/grub.d/10_linux.in: Add rootflags=subvol=<name> if / is on a 
btrfs subvolume.
* util/grub.d/20_linux_xen.in: Likewise.
 2011-04-13 12:57:26 +01:00
Colin Watson 78fa584f67 Rewrite /proc/self/mountinfo handling to cope with bind-mounts and 
move-mounts appearing out of order.  Fixes Ubuntu bug #738345.

* grub-core/kern/emu/getroot.c (find_root_device_from_mountinfo):
Build a list of relevant visible mounts using the mnt_id and
parent_mnt_id fields, and then scan that list at the end.
 2011-04-13 12:36:04 +01:00
Colin Watson 9d5f81622c * docs/grub.texi (normal): New section. 
(normal_exit): New section.
(Embedded configuration): Add reference to normal.
(GRUB only offers a rescue shell): Likewise.
* docs/grub-dev.texi (Error Handling): Fix typo.
 2011-04-12 13:23:19 +01:00
Colin Watson 09a9d66f1d * NEWS: Drop obsolete entry about probe-only btrfs support. 2011-04-12 11:44:35 +01:00
Colin Watson 0c67693394 * util/import_gcry.py: Fix typo. 2011-04-12 11:39:17 +01:00
Colin Watson 2a9bc0169e * grub-core/fs/btrfs.c (grub_btrfs_fs) [GRUB_UTIL]: Set 
reserved_first_sector to 1.  btrfs reserves plenty of space for boot
loaders.
Reported by: Gene Cumm.  Fixes Ubuntu bug #757446.
 2011-04-11 16:06:37 +01:00
Colin Watson 088cdb65eb * grub-core/gnulib/argp-parse.c (__argp_input): Don't crash if pstate 
is NULL.
 2011-04-10 15:25:52 +02:00
Colin Watson 536ce85a8d * docs/grub-dev.texi (Finding your way around): Update for 1.99 
build system.
(Getting started): GRUB is developed in Bazaar now, not Subversion.

(Comment): Fix typo.
(Getting started): General copy-editing.
(Typical Development Experience): Likewise.
(Error Handling): Likewise.
(Video API): Likewise.
 2011-04-09 03:39:47 +01:00
Colin Watson 2cf09e3258 * docs/grub-dev.texi: Replace MoinMoin syntax with Texinfo syntax 
throughout.
 2011-04-09 03:10:59 +01:00
Colin Watson 2c58372857 * docs/grub-dev.texi: Fix spelling of "developer" throughout. 
* grub-core/fs/i386/pc/pxe.c (parse_dhcp_vendor): Fix spelling of
"development".
 2011-04-08 14:01:51 +01:00
Colin Watson 2cccc747ac Store the loopback device as data on loopback grub_disk structures, 
rather than the file it points to.  This fixes use of freed memory
if an existing loopback device is replaced.

* grub-core/disk/loopback.c (grub_loopback_open): Store dev in
disk->data, not dev->file.
(grub_loopback_read): Adjust file assignment to match.
Fixes Ubuntu bug #742967.
 2011-04-01 17:04:10 +01:00
Colin Watson 186ae367af * grub-core/disk/loopback.c (grub_cmd_loopback): Fix a memory leak 
when replacing an existing device.
 2011-04-01 15:35:09 +01:00
Colin Watson 05d2ed3277 * grub-core/normal/menu_entry.c (run): Quieten uninitialised 
warning.  (This was in fact always initialised before use, but GCC
  wasn't smart enough to prove that.)
* grub-core/script/lexer.c (grub_script_lexer_yywrap): Likewise.
 2011-04-01 11:43:51 +01:00
Colin Watson a8afc1d12c * grub-core/mmap/efi/mmap.c (grub_mmap_unregister): Remove 
set-but-not-used variable.
 2011-03-31 12:25:10 +01:00
Colin Watson a826cc7d7e * docs/grub.texi (Simple configuration): Be more explicit about 
GRUB_DEFAULT, and add an example.
Reported by: Leslie Rhorer.
 2011-03-31 08:46:41 +01:00
Colin Watson 875b67ba09 * docs/grub.texi (Commands): Link to "GRUB only offers a rescue 
shell".
 2011-03-30 20:52:26 +01:00
Colin Watson 5e631b4fcb fix ChangeLog ordering 2011-03-30 12:07:43 +01:00
Colin Watson 2d5d0333d6 * docs/grub.texi (default): Use @example rather than nested 
itemized lists to avoid breaking gendocs.
 2011-03-30 11:46:36 +01:00
Colin Watson 3d7ed04e92 * docs/grub.texi (Future): Update. 2011-03-30 11:34:52 +01:00
Colin Watson 2a2da1d030 * docs/grub.texi (Menu-specific commands): Remove some semantics 
that were true in GRUB Legacy but not in GRUB 2.
(submenu): New section.
(false): New section.
(read): New section.
(true): New section.
 2011-03-30 03:49:22 +01:00
Colin Watson a752763906 * docs/grub.texi (Changes from GRUB Legacy): Minor proofreading. 2011-03-30 03:26:11 +01:00
Colin Watson 8a748df2fd credit 2011-03-30 03:22:37 +01:00
Colin Watson e30af0297d * docs/grub.texi (Simple configuration): Explain some of the 
current limitations of grub-mkconfig.
 2011-03-30 03:20:09 +01:00
Colin Watson 5c650f4c8e * docs/grub.texi (loopback): New section. 2011-03-29 18:08:23 +01:00
Colin Watson 61d7156b94 * grub-core/disk/loopback.c (GRUB_MOD_INIT): Stop documenting 
removed -p option.
 2011-03-29 18:00:23 +01:00
Colin Watson 994b826432 * docs/grub.texi (BIOS installation): New section, partly based on 
previous text in other sections.
(Installing GRUB using grub-install): Replace BIOS discussion with a
cross-reference.
(Images): Likewise.
 2011-03-29 14:32:38 +01:00
Colin Watson b4db4f39f0 * grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): If 
real_sb->size is zero (e.g. RAID-0), get the disk size from
real_sb->data_size instead.
Fixes Ubuntu bug #743136.
 2011-03-29 10:51:58 +01:00
Colin Watson 2414872538 * grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Remove stale 
comment.
 2011-03-28 15:17:22 +01:00
Colin Watson f329eda79e * grub-core/disk/raid.c (grub_raid_register): Adjust debug message 
to be specific about what kind of RAID device we're scanning for.
 2011-03-28 13:23:54 +01:00
Colin Watson 4c6c9431d2 * grub-core/video/fb/video_fb.c (grub_video_fb_get_info_and_fini): 
Switch back to page zero before loading a kernel, since some kernel
drivers expect that.
Thanks to: Felix Kuehling.
 2011-03-25 00:03:54 +00:00
Colin Watson ebad0b81be remove unused variable 2011-03-23 14:45:04 +00:00
Colin Watson 9b43bf396a * grub-core/boot/i386/pc/lnxboot.S (real_code_2): Ensure that the 
initial chunk read from the kernel always includes GRUB's multiboot
header, which is now outside the first sector.
 2011-03-11 11:51:10 +00:00
Colin Watson be1a7ce0cf * grub-core/loader/i386/linux.c (find_efi_mmap_size): Page-align 
cached mmap_size, so that this works correctly when called multiple
times.
Reported by: Daniel Kahn Gillmor.  Should fix Debian bug #616638.
 2011-03-09 17:38:31 +00:00
Colin Watson 83a3c48d37 * docs/grub.texi (Simple configuration): Tidy up formatting. 2011-03-09 17:35:16 +00:00
Colin Watson 28f9509eb7 merge trunk 2011-02-17 14:51:11 +00:00
Colin Watson fee7cdd4e1 * util/grub.d/20_linux_xen.in: Bail out early if linux_list is 
empty, since in that case we can only generate either nothing or a
syntactically invalid configuration file.
Reported by: Michal Suchanek.  Fixes Debian bug #612898.
 2011-02-11 13:00:54 +00:00
Colin Watson 97286eb547 * docs/grub.texi (Kernel): Add reference to grub-mkrescue. 
(Making a GRUB bootable CD-ROM): Likewise.
(Invoking grub-mkrescue): New section.
Reported by: Yann Dirson.  Fixes Debian bug #612585.
 2011-02-09 12:14:10 +00:00
Colin Watson 22b28eb3fe * util/grub-install.in: Remove unnecessary brackets from tr 
arguments.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
Reported by: Jamie Heilman.  Fixes Debian bug #612564.
 2011-02-09 11:23:11 +00:00
Colin Watson 7e735e4349 * include/grub/file.h (not_easly_seekable): Rename to ... 
(not_easily_seekable): ... this.  Update all users.
 2011-02-08 13:21:13 +00:00
Colin Watson 5870a4a06f typo 2011-02-04 16:35:07 +00:00
Colin Watson 8c2c4ff2f5 Handle empty dir passed to grub_find_root_device_from_mountinfo; fixes grub-mkrelpath on btrfs subvolumes. 2011-02-04 13:33:16 +00:00
Colin Watson 800f188183 * docs/grub.texi (Making a GRUB bootable CD-ROM): Update to describe 
grub-mkrescue.
 2011-01-28 17:01:28 +00:00
Colin Watson 118fb264ee Support probing multipath disks. 2011-01-25 16:51:23 +00:00
Colin Watson 307ed0b484 remove unused variables 2011-01-25 12:28:11 +00:00
Colin Watson 96e0a6ea97 * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Consider a 
path unreadable if `grub-probe -t abstraction' fails, for example if
memberlist fails on an LVM volume group.
Reported by: Darius Jahandarie.
 2011-01-22 01:26:49 +00:00
Colin Watson 81431e2b02 * docs/grub.texi (Simple configuration): Document 
GRUB_PRELOAD_MODULES.
 2011-01-22 01:11:56 +00:00
Colin Watson 5e79d66a54 * .bzrignore: Remove nonexistent grub-pbkdf2. 2011-01-17 12:48:07 +00:00
Colin Watson bd1a414714 Resolve the device returned by grub_find_root_device_from_mountinfo or 
find_root_device_from_libzfs using grub_find_device.
Reported by: Roderich Schupp.
 2011-01-12 17:27:52 -06:00
Colin Watson 51fa856c58 * configure.ac: Fall back to true' if makeinfo' does not exist. 2011-01-11 17:49:27 -06:00
Colin Watson 6b978c4f04 merge trunk 2011-01-11 10:00:45 -06:00
Colin Watson 86205c94c3 * util/grub-mklayout.c (console_grub_equivalences_shift): Terminate 
with NULL.
(console_grub_equivalences_unshift): Likewise.
Reported by: Daniel Dehennin.
 2011-01-11 09:08:57 -06:00
Colin Watson b7d86d53c4 merge trunk 2011-01-07 17:26:15 +00:00
Colin Watson 11b970d7c9 Always initialise *relroot in grub_find_root_device_from_mountinfo, 
otherwise we free an uninitialised pointer if /proc is unmounted.
Reported by: Scott Moser.
 2011-01-07 17:24:25 +00:00
Colin Watson 6383772c92 remove unused variable 2011-01-06 18:08:01 +00:00
Colin Watson 415502c26a * tests/util/grub-shell.in: Set serial terminfo type to `dumb', to 
avoid causing test failures by clearing the screen.
 2011-01-06 13:24:38 +00:00
Colin Watson 71b6a2b7a2 * grub-core/kern/emu/getroot.c (find_root_device_from_mountinfo): 
Fix prefix check to handle the case where dir ends with a slash
(most significantly, "/" itself).
Reported by: Michael Vogt.
 2011-01-06 11:09:17 +00:00
Colin Watson 304e349b7f include <grub/emu/getroot.h> for grub_find_device 2011-01-05 11:41:12 +00:00
Colin Watson 92882f28b6 merge trunk 2011-01-04 15:51:41 +00:00
Colin Watson 944404efb8 merge trunk 2011-01-04 15:41:07 +00:00
Colin Watson 5b1bdf1231 * grub-core/commands/legacycfg.c (GRUB_MOD_INIT): Fix typo in 
descriptions of extract_legacy_entries_source and
extract_legacy_entries_configfile.
Reported by: Seung Soo, Ha.
 2011-01-04 13:05:19 +00:00
Colin Watson 99d925aad4 * grub-core/bus/pci.c (grub_pci_iterate): Skip remaining functions 
on devices that do not implement function 0.
 2011-01-03 23:56:45 +00:00
Colin Watson 1426ef3560 * include/grub/offsets.h (GRUB_KERNEL_I386_PC_RAW_SIZE): The 
previous patch increased the size of the RS code by 20 bytes (at
least with gcc-4.4), so increase this by 20 bytes to match.
(GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART): Likewise.
 2010-12-21 17:41:47 +00:00
Colin Watson 20641b6baa * grub-core/lib/reed_solomon.c (gauss_solve): Fix size of standalone 
scratch area.  Make sure to initialise chosen in standalone mode as
well as non-standalone.
Reported by: Robert Hooker and Andy Whitcroft.
Tested by: Andy Whitcroft.
 2010-12-21 16:51:08 +00:00
Colin Watson d060ad60ee * grub-core/commands/echo.c (grub_cmd_echo): Make UTF-8-clean by 
constructing a new unescaped string and passing it to grub_xputs in
one go, rather than passing characters to grub_printf one at a time.
 2010-12-21 13:52:07 +00:00
Colin Watson b889cfadf9 * grub-core/fs/udf.c (read_string): Pacify GCC warning by 
initialising utf16.
 2010-12-21 13:00:10 +00:00
Colin Watson 4e01b6c821 * util/grub-mkconfig_lib.in (gettext_quoted): Add clarifying 
comment.  Add an extra layer of quotation, requiring the output of
this function to be used in a printf format string.
(gettext_printf): New function.
* util/grub.d/10_hurd.in: Use gettext_printf where appropriate.
Extract translatable strings from here-documents and use a temporary
variable instead, so that xgettext can find them.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.

* po/grub.d.sed: New file.
* po/Makefile.in.in ($(DOMAIN).pot-update): Extract gettext_printf
arguments.  Set c-format flags on all strings extracted from
util/grub.d/ (xgettext refuses to include these itself for strings
it extracted from a shell file, but these really are c-format).
 2010-12-21 12:49:29 +00:00
Colin Watson 32570200a8 * grub-core/normal/term.c (print_more): Make \r or \n scroll one 
line, and other keys scroll an entire page (previous handling was
for \r and \n to scroll a page and other keys to scroll two lines).
 2010-12-18 17:37:48 +00:00
Colin Watson 5367ecd305 * .bzrignore: Ignore grub-core/rs_decoder.S. 2010-12-10 12:56:45 +00:00
Colin Watson 1fb430f865 * grub-core/gettext/gettext.c (grub_gettext_init_ext): Factor out 
.mo/.mo.gz opening sequence to ...
(grub_mofile_open_lang): ... here.
(grub_gettext_init_ext): If opening ll_CC fails, try ll.
* util/grub.d/00_header.in (grub_lang): Include country part of
locale.
Reported by: Mario Limonciello.
 2010-12-10 11:45:08 +00:00
Colin Watson 24b7938b32 * grub-core/kern/i386/pc/startup.S (grub_console_getkey): Use `>> 1' 
rather than `/ 2', as the latter requires -Wa,--divide which would
require bumping our minimum binutils version.
 2010-12-04 16:19:26 +00:00
Colin Watson ea20f6e03a merge some more commits from before Savannah compromise (mirrored by Launchpad) 2010-12-01 16:19:26 +00:00
Colin Watson 725d286634 merge commits from before Savannah compromise 2010-11-30 17:01:52 +00:00
Colin Watson 9be57a0dad Fix LVM-on-RAID probing. 
* util/grub-probe.c (probe): Remember which disk was detected as
RAID (perhaps an LVM physical volume).  Use that disk's raidname
rather than that of the top-level disk.
 2010-11-26 12:26:37 +00:00
Colin Watson 74f72a6415 * util/deviceiter.c (grub_util_iterate_devices): Save a bit of 
effort by skipping "." and ".." entries up-front.
Suggested by: Michael Lazarev.
 2010-11-24 19:43:32 +00:00
Colin Watson 5a4072785b * grub-core/Makefile.core.def (xz_decompress): Move -lgcc from 
ldflags to ldadd, to fix link line ordering.
(none_decompress): Likewise.
 2010-11-24 19:32:49 +00:00
Colin Watson 3030d8ec49 * grub-core/Makefile.core.def (kernel): Add kern/emu/cache.S for emu 
platforms.
(grub-emu-lite): Remove kern/emu/cache.S.
 2010-11-24 12:07:14 +00:00
Colin Watson b7fbac1214 * util/deviceiter.c (compare_devices): If the by-id link for a 
device couldn't be resolved, fall back to sorting by the by-id link
rather than segfaulting.
Reported and tested by: Daniel Mierswa.
 2010-11-23 17:42:06 +00:00
Colin Watson 5225f32882 * Makefile.util.def (grub-menulst2cfg): List libraries in ldadd, not 
ldflags, to fix link line ordering.
 2010-11-23 15:56:18 +00:00
Colin Watson 038b3ce8dc * grub-core/Makefile.am (gentrigtables): Put -lm after $<; some 
linkers are picky about this.
 2010-11-23 13:00:05 +00:00
Colin Watson bf16e98e3c * grub-core/Makefile.am (command.lst): Adjust sed expression 
ordering so that extended and priority commands aren't treated as
ordinary commands.
 2010-11-23 12:52:40 +00:00
Colin Watson 7242bab6a4 * include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_BIOS_BOOT): 
Remove byte-swapping function calls, which are not valid in
structure initialisers.
* grub-core/partmap/gpt.c (grub_gpt_partition_type_bios_boot): Make
non-const.
(GRUB_MOD_INIT): Byte-swap data1, data2, and data3 fields of
grub_gpt_partition_type_bios_boot.
 2010-11-23 10:48:46 +00:00
Colin Watson 14e8b279e9 Fix test program build on GNU/kFreeBSD. 
* Makefile.util.def (example_unit_test): Add `$(LIBZFS)
$(LIBNVPAIR)' library dependencies.
 2010-11-22 18:22:50 +00:00
Colin Watson e6f63338f7 usual e-mail address 2010-11-22 18:22:00 +00:00
Colin Watson 03df09c7c8 * util/grub-install.in: Fix parsing of --grub-mkrelpath= option. 2010-11-22 13:57:16 +00:00
Colin Watson cf8ffc3825 * util/grub-install.in: Remove excessive quoting that broke 
installations to RAID devices.
 2010-11-22 12:20:57 +00:00
Colin Watson 24ec575b72 * conf/Makefile.common (CFLAGS_GNULIB): Add -Wno-unused-parameter. 
(-Wunused implies -Wunused-parameter, but not vice versa).
 2010-11-16 15:54:18 +00:00
Colin Watson 72b7c7aa36 * configure.ac: Make error messages less confusing by testing for 
-Wtrampolines rather than -Wno-trampolines (since -Wno-* is always
accepted, but produces a diagnostic if something else is wrong).
 2010-11-16 15:50:20 +00:00
Colin Watson a75f4f62ae * util/bin2h.c (main): Fix spelling error in generated output. 2010-11-02 22:51:51 +00:00
Colin Watson 0cbcdf0e6f * docs/grub.texi (Installing GRUB using grub-install): Proofread. 
(Supported kernels): Likewise.
 2010-10-22 14:17:33 +01:00
Colin Watson 0b4b227fae * grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix 
i386 and x86-64 definedness tests.
 2010-09-28 17:38:34 +01:00
Colin Watson e1fd193905 Re-enable grub-extras. 
* autogen.sh: Create symlinks to ${GRUB_CONTRIB} if necessary to
avoid confusing Automake.  Run autogen only twice, once for the top
level and once for grub-core.  Add Makefile.util.def and
Makefile.core.def from extra modules to the appropriate autogen
invocations.  If Makefile.common exists in an extra module, include
it in both Makefile.util.am and grub-core/Makefile.core.am;
similarly, include any Makefile.util.common file in Makefile.util.am
and any Makefile.core.common file in grub-core/Makefile.core.am.
* conf/Makefile.common ($(top_srcdir)/grub-core/Makefile.core.am):
Depend on $(top_srcdir)/grub-core/Makefile.gcry.def.
($(top_srcdir)/grub-core/Makefile.gcry.def): Remove.
* grub-core/Makefile.am: Remove inclusion of Makefile.gcry.am.
* gentpl.py (gvar_add): Turn GVARS into a set.
(global_variable_initializers): Sort global variables on output.
(vars_init): New function.
(first_time): Likewise.
(library): Ensure that non-global variable initialisations are
emitted before the first time we emit code for a library block.
Append to variables rather than setting them.  Only emit
noinst_LIBRARIES, BUILT_SOURCES, and CLEANFILES the first time for
each conditional path.
(program): installdir() emits an Autogen macro, so must be passed to
var_add rather than gvar_add.
(data): Likewise.
(script): Likewise.
(rules): New function, centralising handling for different target
types.  Set up Guile association lists for first_time and vars_init,
and send most output to a diversion so that variable initialisations
can be emitted first.
(module_rules): Use new rules function.
(kernel_rules): Likewise.
(image_rules): Likewise.
(library_rules): Likewise.
(program_rules): Likewise.
(script_rules): Likewise.
(data_rules): Likewise.
* configure.ac: Add AC_PROG_LN_S, for the benefit of ntldr-img.
* .bzrignore: Add contrib and grub-core/contrib.  Remove
grub-core/Makefile.gcry.am.
 2010-09-24 09:48:27 +01:00
Colin Watson 8f03f0b580 * grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix 
typo in __i386__ conditional.
 2010-09-22 16:57:49 +01:00
Colin Watson df7769d8dc * grub-core/normal/menu_entry.c (run): Make sure we always return 
a value.
 2010-09-21 19:03:11 +01:00
Colin Watson b031012d70 * grub-core/commands/efi/lsefimmap.c (grub_cmd_lsefimmap): 
NumberOfPages is UINT64 according to the UEFI specification, not
UINTN.  Fix printf format.
 2010-09-21 16:58:08 +01:00
Colin Watson 174de8f340 * grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Change type of 
`err' to grub_usb_err_t.
Reported and tested by: KESHAV P.R.
 2010-09-21 16:13:04 +01:00
Colin Watson d7dbe92395 * grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Make 
tpart non-const, so that we can assign to it.  (Since this is a
typedef, the constness refers to the pointer rather than what it
points to.)
 2010-09-21 13:41:23 +01:00
Colin Watson 8d5e2af3fc * conf/Makefile.common (CPPFLAGS_GNULIB): Add 
$(top_srcdir)/grub-core/gnulib as well as
$(top_builddir)/grub-core/gnulib.
Reported by: KESHAV P.R.
 2010-09-21 13:37:50 +01:00
Colin Watson 5c5277839a * util/grub-install.in: Fix the bootloader ID option to be 
consistently --bootloader-id, not --bootloader_id.
Reported by: KESHAV P.R.
 2010-09-21 12:10:36 +01:00
Colin Watson d309a16e26 * grub-core/commands/hashsum.c (GRUB_MOD_INIT): Make "Compute or 
check hash checksum." consistently translatable.
 2010-09-21 11:14:06 +01:00
Colin Watson c4fe27a827 * grub-core/commands/hashsum.c (aliases): Add sha1sum alias. 
(GRUB_MOD_INIT): Register sha1sum command.
(GRUB_MOD_FINI): Unregister sha1sum command.
 2010-09-21 10:56:16 +01:00