picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tmpfiles: Handle filesystems without ACL support in more cases.

Browse source
This commit is contained in:
Pat Coulthard 2020-10-25 16:45:13 -05:00 committed by Lennart Poettering
parent a0223c308e
commit 3045c416e1
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/tmpfiles/tmpfiles.c
View file

@ -1104,13 +1104,17 @@ static int path_set_acl(const char *path, const char *pretty, acl_type_t type, a
strna(t), pretty); strna(t), pretty);
r = acl_set_file(path, type, dup); r = acl_set_file(path, type, dup);
if (r < 0) if (r < 0) {
/* Return positive to indicate we already warned */ if (ERRNO_IS_NOT_SUPPORTED(errno))
return -log_error_errno(errno, /* No error if filesystem doesn't support ACLs. Return negative. */
"Setting %s ACL \"%s\" on %s failed: %m", return -errno;
type == ACL_TYPE_ACCESS ? "access" : "default", else
strna(t), pretty); /* 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), pretty);
}
return 0; return 0;
} }
#endif #endif
@ -1150,6 +1154,11 @@ static int fd_set_acls(Item *item, int fd, const char *path, const struct stat *
if (r == 0 && item->acl_default && S_ISDIR(st->st_mode)) if (r == 0 && item->acl_default && S_ISDIR(st->st_mode))
r = path_set_acl(procfs_path, path, ACL_TYPE_DEFAULT, item->acl_default, item->append_or_force); r = path_set_acl(procfs_path, path, ACL_TYPE_DEFAULT, item->acl_default, item->append_or_force);
if (ERRNO_IS_NOT_SUPPORTED(r)) {
log_debug_errno(r, "ACLs not supported by file system at %s", path);
return 0;
}
if (r > 0) if (r > 0)
return -r; /* already warned */ return -r; /* already warned */
@ -1157,10 +1166,6 @@ static int fd_set_acls(Item *item, int fd, const char *path, const struct stat *
if (r == -ENOENT && proc_mounted() == 0) if (r == -ENOENT && proc_mounted() == 0)
r = -ENOSYS; r = -ENOSYS;
if (r == -EOPNOTSUPP) {
log_debug_errno(r, "ACLs not supported by file system at %s", path);
return 0;
}
if (r < 0) if (r < 0)
return log_error_errno(r, "ACL operation on \"%s\" failed: %m", path); return log_error_errno(r, "ACL operation on \"%s\" failed: %m", path);
#endif #endif