From: Felix Abecassis <fabecassis@nvidia.com>
Date: Wed, 14 Mar 2018 23:20:18 +0000 (-0700)
Subject: conf: do not run the "mount" hooks twice
X-Git-Tag: lxc-3.0.0.beta2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a2cf89d9976e11c089a7672de5adf89148742f5;p=thirdparty%2Flxc.git

conf: do not run the "mount" hooks twice

Regression introduced by 8353b4c90ed18e570521134f2c60bef56a082b55

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 0d399a73b..cd99124f9 100644
--- 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;
 	}