diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-03-15 15:51:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 15:51:47 +0100 |
| commit | f5abe8f95721213edd76c16ed829cc3e37d7bdc6 (patch) | |
| tree | b4af5bf9ca547f211ad9d841a37bd0a4d5c88430 /src/boot | |
| parent | 39eb3ffaaa3cdaf47c39cee11c80500c2fee338f (diff) | |
| parent | ea8282b6fc90a80f48ed66fead1e662ddb9050b9 (diff) | |
| download | systemd-f5abe8f95721213edd76c16ed829cc3e37d7bdc6.tar.gz | |
Merge pull request #26784 from DaanDeMeyer/chase-fix
Allow creating files and directories with chase_symlinks_open() and further improvements
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/bootctl-install.c | 2 | ||||
| -rw-r--r-- | src/boot/bootctl-status.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c index 9fee309328..f520fc7ffa 100644 --- a/src/boot/bootctl-install.c +++ b/src/boot/bootctl-install.c @@ -664,7 +664,7 @@ static int install_variables( return 0; } - r = chase_symlinks_and_access(path, esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, F_OK, NULL, NULL); + r = chase_symlinks_and_access(path, esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, F_OK, NULL); if (r == -ENOENT) return 0; if (r < 0) diff --git a/src/boot/bootctl-status.c b/src/boot/bootctl-status.c index e25cd963ae..ce97b013cf 100644 --- a/src/boot/bootctl-status.c +++ b/src/boot/bootctl-status.c @@ -560,7 +560,7 @@ static void deref_unlink_file(Hashmap *known_files, const char *fn, const char * return; if (arg_dry_run) { - r = chase_symlinks_and_access(fn, root, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, F_OK, &path, NULL); + r = chase_symlinks_and_access(fn, root, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, F_OK, &path); if (r < 0) log_info_errno(r, "Unable to determine whether \"%s\" exists, ignoring: %m", fn); else |