SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: a couple of tweaks recommended by Coccinelle

Browse Source
This commit is contained in:
Frantisek Sumsal
2022-07-25 12:47:23 +02:00
committed by Lennart Poettering
parent 46e6449acb
commit 05abe85033
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/bootctl.c
+2 -2
View File
@@ -872,7 +872,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
"Failed to resolve path %s%s%s: %m",
p,
root ? " under directory " : "",
root ?: "");
strempty(root));
q = path_join("/EFI/systemd/", dest_name);
if (!q)
@@ -918,7 +918,7 @@ static int install_binaries(const char *esp_path, const char *arch, bool force)
if (r == -ENOENT && root && arg_install_source == ARG_INSTALL_SOURCE_AUTO)
r = chase_symlinks_and_opendir(BOOTLIBDIR, NULL, CHASE_PREFIX_ROOT, &path, &d);
if (r < 0)
return log_error_errno(r, "Failed to open boot loader directory %s%s: %m", root ?: "", BOOTLIBDIR);
return log_error_errno(r, "Failed to open boot loader directory %s%s: %m", strempty(root), BOOTLIBDIR);
const char *suffix = strjoina(arch, ".efi");
const char *suffix_signed = strjoina(arch, ".efi.signed");
src/shared/find-esp.c
+6 -6
View File
@@ -416,7 +416,7 @@ int find_esp_and_warn(
"Failed to resolve path %s%s%s: %m",
path,
root ? " under directory " : "",
root ?: "");
strempty(root));
r = verify_esp(p, ret_part, ret_pstart, ret_psize, ret_uuid, ret_devid, flags);
if (r < 0)
@@ -435,7 +435,7 @@ int find_esp_and_warn(
"Failed to resolve path %s%s%s: %m",
path,
root ? " under directory " : "",
root ?: "");
strempty(root));
if (!path_is_valid(p) || !path_is_absolute(p))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
@@ -474,7 +474,7 @@ int find_esp_and_warn(
"Failed to resolve path %s%s%s: %m",
dir,
root ? " under directory " : "",
root ?: "");
strempty(root));
r = verify_esp(p, ret_part, ret_pstart, ret_psize, ret_uuid, ret_devid,
flags | VERIFY_ESP_SEARCHING);
@@ -712,7 +712,7 @@ int find_xbootldr_and_warn(
"Failed to resolve path %s%s%s: %m",
path,
root ? " under directory " : "",
root ?: "");
strempty(root));
r = verify_xbootldr(p, /* searching= */ false, unprivileged_mode, ret_uuid, ret_devid);
if (r < 0)
@@ -731,7 +731,7 @@ int find_xbootldr_and_warn(
"Failed to resolve path %s%s%s: %m",
path,
root ? " under directory " : "",
root ?: "");
strempty(root));
if (!path_is_valid(p) || !path_is_absolute(p))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
@@ -758,7 +758,7 @@ int find_xbootldr_and_warn(
return log_error_errno(r,
"Failed to resolve path /boot%s%s: %m",
root ? " under directory " : "",
root ?: "");
strempty(root));
r = verify_xbootldr(p, true, unprivileged_mode, ret_uuid, ret_devid);
if (r >= 0)