diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-09 10:53:16 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-02-09 14:46:17 +0000 |
| commit | 77db9ef2ab4acf88d093086031f529c7d5c3e407 (patch) | |
| tree | d10081057de936ed9ee669201deff64c09125fcb /src/boot/bootctl-util.c | |
| parent | dbfd5d38377c523a44d0fb66a8516ae1e5998afe (diff) | |
| download | systemd-77db9ef2ab4acf88d093086031f529c7d5c3e407.tar.gz | |
boot: Make sure we take --root into account everywhere.
Diffstat (limited to 'src/boot/bootctl-util.c')
| -rw-r--r-- | src/boot/bootctl-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/boot/bootctl-util.c b/src/boot/bootctl-util.c index 859742a126..f89721244a 100644 --- a/src/boot/bootctl-util.c +++ b/src/boot/bootctl-util.c @@ -120,7 +120,7 @@ int settle_entry_token(void) { case ARG_ENTRY_TOKEN_AUTO: { _cleanup_free_ char *buf = NULL, *p = NULL; - p = path_join(etc_kernel(), "entry-token"); + p = path_join(arg_root, etc_kernel(), "entry-token"); if (!p) return log_oom(); r = read_one_line_file(p, &buf); @@ -133,7 +133,7 @@ int settle_entry_token(void) { } else if (sd_id128_is_null(arg_machine_id)) { _cleanup_free_ char *id = NULL, *image_id = NULL; - r = parse_os_release(NULL, + r = parse_os_release(arg_root, "IMAGE_ID", &image_id, "ID", &id); if (r < 0) @@ -171,7 +171,7 @@ int settle_entry_token(void) { case ARG_ENTRY_TOKEN_OS_IMAGE_ID: { _cleanup_free_ char *buf = NULL; - r = parse_os_release(NULL, "IMAGE_ID", &buf); + r = parse_os_release(arg_root, "IMAGE_ID", &buf); if (r < 0) return log_error_errno(r, "Failed to load /etc/os-release: %m"); @@ -185,7 +185,7 @@ int settle_entry_token(void) { case ARG_ENTRY_TOKEN_OS_ID: { _cleanup_free_ char *buf = NULL; - r = parse_os_release(NULL, "ID", &buf); + r = parse_os_release(arg_root, "ID", &buf); if (r < 0) return log_error_errno(r, "Failed to load /etc/os-release: %m"); |