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

conf: clearly report to either use drop or keep

Merge pull request #1340 from brauner/2016-12-02/cap_drop_keep_report_better_error
f8df61b2 · Stéphane Graber · GitHub · 8500665f · 7389ca26 · f8df61b2
Commit f8df61b2 authored Dec 02, 2016 by Stéphane Graber Committed by GitHub Dec 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

conf.c src/lxc/conf.c +1 -1

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3952,7 +3952,7 @@ int lxc_setup(struct lxc_handler *handler)

 	if (!lxc_list_empty(&lxc_conf->keepcaps)) {
 		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;
 		}
 		if (dropcaps_except(&lxc_conf->keepcaps)) {