summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-09 14:01:26 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-09 14:01:26 +0200
commit542a69a284805aaf5b92b0e5da39339967d516e3 (patch)
tree2a16ffd21b56d92be81fede6b0068888e1c4c3db /src/core
parent9c00a6adfa6c2ded071222b2ec76295480add34e (diff)
parentf8c1a81c5188ca121573caeee290e39ef966e3e6 (diff)
Merge pull request #1212 from again4you/devel/fix_smack_label_#3
Wrong smack label of the symlink in CGROUP root directory when enabling '--with-smack-run-label' (v3)
Diffstat (limited to 'src/core')
-rw-r--r--src/core/mount-setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index e84f80b61b..65f3d06ad0 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -303,6 +303,11 @@ int mount_cgroup_controllers(char ***join_controllers) {
r = symlink(options, t);
if (r < 0 && errno != EEXIST)
return log_error_errno(errno, "Failed to create symlink %s: %m", t);
+#ifdef SMACK_RUN_LABEL
+ r = mac_smack_copy(t, options);
+ if (r < 0 && r != -EOPNOTSUPP)
+ return log_error_errno(r, "Failed to copy smack label from %s to %s: %m", options, t);
+#endif
}
}
}