Merge pull request #2217 from flx42/fix-mount-hooks-double-call

conf: do not run the "mount" hooks twice

Merge pull request #2217 from flx42/fix-mount-hooks-double-call
d61bda5f · Christian Brauner · GitHub · 55fc780b · 1a2cf89d · d61bda5f
Unverified Commit d61bda5f authored Mar 15, 2018 by Christian Brauner Committed by GitHub Mar 15, 2018
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
@@ -3368,7 +3368,7 @@ int lxc_setup(struct lxc_handler *handler)
 	}
 	ret = run_lxc_hooks(name, "mount", lxc_conf, NULL);
-	if (run_lxc_hooks(name, "mount", lxc_conf, NULL)) {
+	if (ret < 0) {
 		ERROR("Failed to run mount hooks");
 		return -1;
 	}