projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0bc504
)
tmpfiles: mostly revert 71044f609b829d802e0eb81270e13b4f55d76476
author
Lennart Poettering
<lennart@poettering.net>
Fri, 10 Apr 2015 12:44:52 +0000
(14:44 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 10 Apr 2015 14:23:46 +0000
(16:23 +0200)
Add a comment why returning a positive error is OK and intended in this
case.
(It's still a nasty hack to do this though!)
src/tmpfiles/tmpfiles.c
patch
|
blob
|
history
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index ce4a10aa865166f13ad8fa278dbb383d536a4115..24a0d36842846328ae1c4737a2047f1b0fef5309 100644
(file)
--- a/
src/tmpfiles/tmpfiles.c
+++ b/
src/tmpfiles/tmpfiles.c
@@
-734,10
+734,11
@@
static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif
r = acl_set_file(path, type, dup);
if (r < 0)
- return log_error_errno(errno,
- "Setting %s ACL \"%s\" on %s failed: %m",
- type == ACL_TYPE_ACCESS ? "access" : "default",
- strna(t), path);
+ /* Return positive to indicate we already warned */
+ return -log_error_errno(errno,
+ "Setting %s ACL \"%s\" on %s failed: %m",
+ type == ACL_TYPE_ACCESS ? "access" : "default",
+ strna(t), path);
return 0;
}