dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-12 22:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

tmpfiles: do not fail when trying to apply ACL during mkosi build

Browse Source 
When running in a mkosi namespaced env tmpfiles fails to set ACLs:

Running create action for entry a /buildroot/var/log/journal
Setting access ACL u::rwx,g::r-x,g:adm:r-x,m::r-x,o::r-x on /buildroot/var/log/journal
Setting access ACL "u::rwx,g::r-x,g:adm:r-x,m::r-x,o::r-x" on /buildroot/var/log/journal failed: Invalid argument

If EINVAL is returned and we are in a chroot, skip gracefully via
EOPNOTSUPP. The ACLs will be set on first boot.

(cherry picked from commit 3754ceba6f)
(cherry picked from commit 4a28892f49)
This commit is contained in:
Luca Boccassi
2026-06-22 22:26:17 +01:00
parent 06bcb38bd4
commit af02acdc72
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tmpfiles/tmpfiles.c
View File

@@ -1396,16 +1396,20 @@ static int path_set_acl(
strna(t), pretty);
if (!arg_dry_run &&
sym_acl_set_file(path, type, dup) < 0) {
if (ERRNO_IS_NOT_SUPPORTED(errno))
(r = RET_NERRNO(sym_acl_set_file(path, type, dup))) < 0) {
if (ERRNO_IS_NOT_SUPPORTED(r))
/* No error if filesystem doesn't support ACLs. Return negative. */
return -errno;
else
/* 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 r;
if (r == -EINVAL && running_in_chroot() > 0)
return log_warning_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Setting %s ACL \"%s\" on %s failed. A chroot environment was detected, ignoring.",
type == ACL_TYPE_ACCESS ? "access" : "default",
strna(t), pretty);
/* Return positive to indicate we already warned */
return -log_error_errno(r,
"Setting %s ACL \"%s\" on %s failed: %m",
type == ACL_TYPE_ACCESS ? "access" : "default",
strna(t), pretty);
}
return 0;
}