summaryrefslogtreecommitdiffstats
path: root/src/boot
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 02:19:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 02:19:40 +0000
commit0a0abc373c07a7744adac48891a393e0882fdb6f (patch)
tree725955c83a4b5835007e94d0f85bb908d42ca897 /src/boot
parentReleasing progress-linux version 252.23-1~deb12u1progress7u1. (diff)
downloadsystemd-0a0abc373c07a7744adac48891a393e0882fdb6f.tar.xz
systemd-0a0abc373c07a7744adac48891a393e0882fdb6f.zip
Merging upstream version 252.25.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/bless-boot.c2
-rw-r--r--src/boot/efi/boot.c8
-rw-r--r--src/boot/efi/cpio.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
index 268651a..e863d3c 100644
--- a/src/boot/bless-boot.c
+++ b/src/boot/bless-boot.c
@@ -476,7 +476,7 @@ static int verb_set(int argc, char *argv[], void *userdata) {
/* First, fsync() the directory these files are located in */
r = fsync_parent_at(fd, skip_slash(target));
if (r < 0)
- log_debug_errno(errno, "Failed to synchronize image directory, ignoring: %m");
+ log_debug_errno(r, "Failed to synchronize image directory, ignoring: %m");
/* Secondly, syncfs() the whole file system these files are located in */
if (syncfs(fd) < 0)
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index d7b94bc..7fca854 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -2305,9 +2305,9 @@ static EFI_STATUS initrd_prepare(
assert(ret_initrd_size);
if (entry->type != LOADER_LINUX || !entry->initrd) {
- ret_options = NULL;
- ret_initrd = NULL;
- ret_initrd_size = 0;
+ *ret_options = NULL;
+ *ret_initrd = NULL;
+ *ret_initrd_size = 0;
return EFI_SUCCESS;
}
@@ -2517,7 +2517,7 @@ static EFI_STATUS secure_boot_discover_keys(Config *config, EFI_FILE *root_dir)
EFI_STATUS err;
_cleanup_(file_closep) EFI_FILE *keys_basedir = NULL;
- if (secure_boot_mode() != SECURE_BOOT_SETUP)
+ if (!IN_SET(secure_boot_mode(), SECURE_BOOT_SETUP, SECURE_BOOT_AUDIT))
return EFI_SUCCESS;
/* the lack of a 'keys' directory is not fatal and is silently ignored */
diff --git a/src/boot/efi/cpio.c b/src/boot/efi/cpio.c
index 79b5d43..34d8be4 100644
--- a/src/boot/efi/cpio.c
+++ b/src/boot/efi/cpio.c
@@ -63,7 +63,7 @@ static EFI_STATUS pack_cpio_one(
char *a;
assert(fname);
- assert(contents_size || contents_size == 0);
+ assert(contents || contents_size == 0);
assert(target_dir_prefix);
assert(inode_counter);
assert(cpio_buffer);