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

conf: do not run the "mount" hooks twice
This commit is contained in:
Christian Brauner 2018-03-15 00:37:17 +01:00 committed by GitHub
commit d61bda5fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;
}