From 79a1b18711d927c68cce4424d1731f73cf001611 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 22 Nov 2017 14:55:14 +0100 Subject: [PATCH] tmpfiles: fix typo in error message Fixes #4097. As of current master, systemd-tmpfiles behaves correctly, apart from a trivial typo. So let's tell github to close the bug. With current git: $ sudo SYSTEMD_LOG_LEVEL=debug build/systemd-tmpfiles --create `pwd`/test/tmpfiles.d/link-loop.conf Successfully loaded SELinux database in 2.385ms, size on heap is 321K. Reading config file "/home/zbyszek/src/systemd-work/test/tmpfiles.d/link-loop.conf". Running create action for entry D /run/hello2 Found existing directory "/run/hello2". "/run/hello2" has right mode 41777 Running create action for entry f /run/hello2/hello2.test "/run/hello2/hello2.test" has been created. "/run/hello2/hello2.test" has right mode 101777 chown "/run/hello2/hello2.test" to 0.84 Running create action for entry L /run/hello2/hello2.link Found existing symlink "/run/hello2/hello2.link". Running create action for entry z /run/hello2/hello2.test "/run/hello2/hello2.test" has right mode 101777 chown "/run/hello2/hello2.test" to 0.0 Running create action for entry z /run/hello2/hello2.link Skipping mode an owner fix for symlink /run/hello2/hello2.link. and the permissions are: $ ls -dl /run/hello2/ /run/hello2/* drwxrwxrwt. 2 foo bar 80 Nov 22 14:40 /run/hello2/ lrwxrwxrwx. 1 root root 23 Nov 22 14:40 /run/hello2/hello2.link -> /run/hello2/hello2.test -rwxrwxrwt. 1 root root 0 Nov 22 14:40 /run/hello2/hello2.test Everything seems correct. --- src/tmpfiles/tmpfiles.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 7061b2fefb9..2b568daa234 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -671,7 +671,7 @@ static int path_set_perms(Item *i, const char *path) { return log_error_errno(errno, "Failed to fstat() file %s: %m", path); if (S_ISLNK(st.st_mode)) - log_debug("Skipping mode an owner fix for symlink %s.", path); + log_debug("Skipping mode and owner fix for symlink %s.", path); else { char fn[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; xsprintf(fn, "/proc/self/fd/%i", fd); -- 2.47.3