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

core/socket: fix reversed symlink direction in error message

Browse Source 
After the update to 260-rc1 in Fedora Rawhide, we get a lot of messages like
this:
  systemd[1]: systemd-resolved-monitor.socket:
  Failed to create symlink /run/systemd/resolve/io.systemd.Resolve.Monitor →
  /run/varlink/registry/io.systemd.Resolve.Monitor, ignoring: Permission denied

The actual issue will need to be fixed too, but let's fix the message first.
While at it, let's rename the variables to be meaningful.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-02-26 11:34:22 +01:00
committed by Mike Yuan
parent 8a2b2828cc
commit 13167bfc2f
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/socket.c
+11 -12
View File
@@ -1347,30 +1347,29 @@ static int mq_address_create(
}
static int socket_symlink(Socket *s) {
const char *p;
int r;
assert(s);
p = socket_find_symlink_target(s);
if (!p)
const char *target = socket_find_symlink_target(s);
if (!target)
return 0;
STRV_FOREACH(i, s->symlinks) {
(void) mkdir_parents_label(*i, s->directory_mode);
STRV_FOREACH(linkpath, s->symlinks) {
(void) mkdir_parents_label(*linkpath, s->directory_mode);
r = symlink_idempotent(p, *i, false);
r = symlink_idempotent(target, *linkpath, false);
if (r == -EEXIST && s->remove_on_stop) {
/* If there's already something where we want to create the symlink, and the destructive
* RemoveOnStop= mode is set, then we might as well try to remove what already exists and try
* again. */
/* If there's already something where we want to create the symlink, and the
* destructive RemoveOnStop= mode is set, then we might as well try to remove what
* already exists and try again. */
if (unlink(*i) >= 0)
r = symlink_idempotent(p, *i, false);
if (unlink(*linkpath) >= 0)
r = symlink_idempotent(target, *linkpath, false);
}
if (r < 0)
log_unit_warning_errno(UNIT(s), r, "Failed to create symlink %s %s %s, ignoring: %m",
p, glyph(GLYPH_ARROW_RIGHT), *i);
*linkpath, glyph(GLYPH_ARROW_RIGHT), target);
}
return 0;