From: r-vdp <ramses@well-founded.dev>
Date: Mon, 29 Jan 2024 10:21:12 +0000 (+0100)
Subject: Fix bug where systemd-tmpfiles gets stuck on fifos in tmp.
X-Git-Tag: v256-rc1~1022
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25e6ce1c11a3881cf68d41d4d16711684ef56267;p=thirdparty%2Fsystemd.git

Fix bug where systemd-tmpfiles gets stuck on fifos in tmp.

Fixes #30690.
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 9601c538bcb..dbe9156f067 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -822,7 +822,7 @@ static int dir_cleanup(
 
                         fd = xopenat(dirfd(d),
                                      de->d_name,
-                                     O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME,
+                                     O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME|O_NONBLOCK,
                                      /* xopen_flags = */ 0,
                                      /* mode = */ 0);
                         if (fd < 0 && !IN_SET(fd, -ENOENT, -ELOOP))