From: Yu Watanabe Date: Fri, 31 Jul 2026 16:32:01 +0000 (+0900) Subject: tmpfiles: fix log message about BSD lock X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;p=thirdparty%2Fsystemd.git tmpfiles: fix log message about BSD lock --- diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 9531762ee9e..f574e6e9151 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -774,7 +774,7 @@ static int dir_cleanup( if (!arg_dry_run && flock(dirfd(sub_dir), LOCK_EX|LOCK_NB) < 0) { - log_debug_errno(errno, "Couldn't acquire shared BSD lock on directory \"%s\", skipping: %m", sub_path); + log_debug_errno(errno, "Couldn't acquire exclusive BSD lock on directory \"%s\", skipping: %m", sub_path); continue; } @@ -867,7 +867,7 @@ static int dir_cleanup( if (fd < 0 && !IN_SET(fd, -ENOENT, -ELOOP)) log_warning_errno(fd, "Opening file \"%s\" failed, proceeding without lock: %m", sub_path); if (fd >= 0 && flock(fd, LOCK_EX|LOCK_NB) < 0 && errno == EAGAIN) { - log_debug_errno(errno, "Couldn't acquire shared BSD lock on file \"%s\", skipping: %m", sub_path); + log_debug_errno(errno, "Couldn't acquire exclusive BSD lock on file \"%s\", skipping: %m", sub_path); continue; } } @@ -3567,7 +3567,7 @@ static int item_instance_open_directory_and_lock( if (!arg_dry_run && flock(dirfd(d), LOCK_EX|LOCK_NB) < 0) { - log_debug_errno(errno, "Couldn't acquire shared BSD lock on directory \"%s\", skipping: %m", instance); + log_debug_errno(errno, "Couldn't acquire exclusive BSD lock on directory \"%s\", skipping: %m", instance); return 0; }