grub:master

Last commit made on 2024-02-15
Get this branch:
git clone -b master https://git.launchpad.net/grub

Branch merges

Branch information

Name:
master
Repository:
lp:grub

Recent commits

04d2a50... by Julian Andres Klode

Revert "templates: Reinstate unused version comparison functions with warning"

We reinstated these functions before the 2.12 release with a warning
such that users upgrading to 2.12 who had custom scripts using them
would not get broken in the upgrade and agreed to remove them after
the 2.12 release. This removes them accordingly.

This reverts commit e7a831963 (templates: Reinstate unused version
comparison functions with warning).

Cc: Mathieu Desnoyers <email address hidden>
Cc: Daniel Kiper <email address hidden>
Signed-off-by: Julian Andres Klode <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

4380c2d... by Gary Lin <email address hidden>

util/bash-completion: Load scripts on demand

There are two system directories for bash-completion scripts. One is
/usr/share/bash-completion/completions/ and the other is
/etc/bash_completion.d/. The "etc" scripts are loaded in advance and
for backward compatibility while the "usr" scripts are loaded on demand.
To load scripts on demand it requires a corresponding script for every
command. So, the main bash-completion script is split into several
subscripts for different "grub-*" commands. To share the code the real
completion functions are still implemented in "grub" and each
subscript sources "grub" and invokes the corresponding function.

Signed-off-by: Gary Lin <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

9e1b18f... by Samuel thibault

util/grub.d/10_hurd.in: Find proper ld.so on 64-bit systems

The 64-bit ABI defines ld.so to be /lib/ld-x86-64.so.1.

Signed-off-by: Samuel Thibault <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

a8c0504... by Samuel thibault

osdep/hurd/getroot: Fix 64-bit build

The file_get_fs_options() takes a mach_msg_type_number_t, 32-bit,
not a size_t, 64-bit on 64-bit platforms.

Signed-off-by: Samuel Thibault <email address hidden>
Reviewed-by: Vladimir Serbinenko <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

d89a2a6... by Alec Brown <email address hidden>

loader/i386/multiboot_mbi: Clean up redundant code

In grub-core/loader/i386/multiboot_mbi.c, Coverity spotted redundant code where
the variable err was being set to GRUB_ERR_NONE and then being overwritten
later without being used. Since this is unnecessary, we can remove the code
that sets err to GRUB_ERR_NONE.

Fixes: CID 428877

Signed-off-by: Alec Brown <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

db0d19d... by Alec Brown <email address hidden>

osdep/unix/getroot: Clean up redundant code

In grub-core/osdep/unix/getroot.c, Coverity spotted redundant code where the
double pointer os_dev was being set to 0 and then being overwritten later
without being used. Since this is unnecessary, we can remove the code that
sets os_dev to 0.

Fixes: CID 428875

Signed-off-by: Alec Brown <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

c8bf758... by Alec Brown <email address hidden>

fs/jfs: Clean up redundant code

In grub-core/fs/jfs.c, Coverity spotted redundant code where the pointer diro
was being set to 0 and then being overwritten later without being used. Since
this is unnecessary, we can remove the code that sets diro to 0.

Fixes: CID 428876

Signed-off-by: Alec Brown <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

5a311d0... by Gary Lin <email address hidden>

tests: Switch password quality check off for luks2 test

When adding/changing the password for the luks2 partition, cryptsetup
may reject the command due to the weak password. Since this is only for
testing, add "--force-password" to switch password quality check off to
avoid the unexpected failure.

Signed-off-by: Gary Lin <email address hidden>
Reviewed-by: Glenn Washburn <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

b835601... by Oskari Pirhonen <email address hidden>

build: Include grub-core/extra_deps.lst in dist

Fixes build failure due to the extra_deps.lst file not existing in the
tarball. Found while trying to package GRUB 2.12 for Gentoo.

  make[3]: *** No rule to make target '/var/tmp/portage/sys-boot/grub-2.12/work/grub-2.12/grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop.

Fixes: 89fbe0cac (grub-core/Makefile.am: Make path to extra_deps.lst relative to $(top_srcdir)/grub-core)
Fixes: 154dcb1ae (build: Allow explicit module dependencies)

Signed-off-by: Oskari Pirhonen <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

8961305... by Daniel Kiper <email address hidden>

Bump version to 2.13

Signed-off-by: Daniel Kiper <email address hidden>