Skip to content

L
lxc
Commit f8df61b2 by Stéphane Graber Committed by GitHub
Options

Merge pull request #1340 from brauner/2016-12-02/cap_drop_keep_report_better_error

conf: clearly report to either use drop or keep
parents 8500665f 7389ca26
Showing with 1 addition and 1 deletion
src/lxc/conf.c
...@@ -3952,7 +3952,7 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3952,7 +3952,7 @@ int lxc_setup(struct lxc_handler *handler)
if (!lxc_list_empty(&lxc_conf->keepcaps)) { if (!lxc_list_empty(&lxc_conf->keepcaps)) {
if (!lxc_list_empty(&lxc_conf->caps)) { if (!lxc_list_empty(&lxc_conf->caps)) {
ERROR("Simultaneously requested dropping and keeping caps"); ERROR("Container requests lxc.cap.drop and lxc.cap.keep: either use lxc.cap.drop or lxc.cap.keep, not both.");
return -1; return -1;
} }
if (dropcaps_except(&lxc_conf->keepcaps)) { if (dropcaps_except(&lxc_conf->keepcaps)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment