diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-04-10 14:44:52 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-04-10 16:23:46 +0200 |
| commit | 3ea40b781060f4fa429f77356f8baef4bdf3d4b5 (patch) | |
| tree | b5c41c90f58d2176ee2baaee6ffedf9840edefde | |
| parent | device-nodes: minor simplifications (diff) | |
| download | systemd-3ea40b781060f4fa429f77356f8baef4bdf3d4b5.tar.xz systemd-3ea40b781060f4fa429f77356f8baef4bdf3d4b5.zip | |
tmpfiles: mostly revert 71044f609b829d802e0eb81270e13b4f55d76476
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!)
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index ce4a10aa86..24a0d36842 100644 --- 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; } |