mirror of
https://github.com/systemd/systemd
synced 2024-09-15 22:30:22 +00:00
Merge pull request #2205 from pohly/cgroup-smack-run-label
mount-setup.c: fix handling of symlink Smack labelling in cgroup setup
This commit is contained in:
commit
2135de9adb
|
@ -304,13 +304,18 @@ int mount_cgroup_controllers(char ***join_controllers) {
|
|||
return log_oom();
|
||||
|
||||
r = symlink(options, t);
|
||||
if (r < 0 && errno != EEXIST)
|
||||
return log_error_errno(errno, "Failed to create symlink %s: %m", t);
|
||||
if (r >= 0) {
|
||||
#ifdef SMACK_RUN_LABEL
|
||||
r = mac_smack_copy(t, options);
|
||||
_cleanup_free_ char *src;
|
||||
src = strappend("/sys/fs/cgroup/", options);
|
||||
if (!src)
|
||||
return log_oom();
|
||||
r = mac_smack_copy(t, src);
|
||||
if (r < 0 && r != -EOPNOTSUPP)
|
||||
return log_error_errno(r, "Failed to copy smack label from %s to %s: %m", options, t);
|
||||
return log_error_errno(r, "Failed to copy smack label from %s to %s: %m", src, t);
|
||||
#endif
|
||||
} else if (errno != EEXIST)
|
||||
return log_error_errno(errno, "Failed to create symlink %s: %m", t);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue