mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-04 15:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22784 from poettering/bootctl-fixlets

Browse Source 
Trivial bootctl/kernel-install fixlets
This commit is contained in:
Lennart Poettering 2022-03-18 11:53:08 +01:00 committed by GitHub
commit af5ee76c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/boot/bootctl.c
View File

@ -899,10 +899,10 @@ static int install_binaries(const char *esp_path, bool force) {
/* skip the .efi file, if there's a .signed version of it */
if (endswith_no_case(de->d_name, ".efi")) {
_cleanup_free_ const char *s = strjoin(BOOTLIBDIR, "/", de->d_name, ".signed");
_cleanup_free_ const char *s = strjoin(de->d_name, ".signed");
if (!s)
return log_oom();
if (access(s, F_OK) >= 0)
if (faccessat(dirfd(d), s, F_OK, 0) >= 0)
continue;
}
@ -1932,6 +1932,8 @@ static int verb_install(int argc, char *argv[], void *userdata) {
bool install, graceful;
int r;
/* Invoked for both "update" and "install" */
install = streq(argv[0], "install");
graceful = !install && arg_graceful; /* support graceful mode for updates */
@ -2044,7 +2046,7 @@ static int verb_remove(int argc, char *argv[], void *userdata) {
q = remove_entry_directory(arg_esp_path);
if (q < 0 && r >= 0)
r = 1;
r = q;
if (arg_xbootldr_path) {
/* Remove the latter two also in the XBOOTLDR partition if it exists */

2
src/kernel-install/kernel-install
View File

@ -85,6 +85,7 @@ else
shift
fi
# These two settings are settable in install.conf
layout=
initrd_generator=
@ -183,7 +184,6 @@ export KERNEL_INSTALL_STAGING_AREA
[ "$layout" = "bls" ]
MAKE_ENTRY_DIR_ABS=$?
ret=0
PLUGINS="$(