start: Fix net iface remaining issue

When creating container that has multiple net ifaces fails because of wrong net config, lxc doesn't remove previously created net ifaces. Solve this issue with changing return path in lxc_spawn(). Signed-off-by: Jungsub Shin jungsub_shin@tmax.co.kr

start: Fix net iface remaining issue
78852a0c · Jungsub Shin · 501751d0 · 78852a0c
Commit 78852a0c authored Aug 21, 2018 by Jungsub Shin
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 16 deletions

start.c src/lxc/start.c +15 -16

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1662,6 +1662,20 @@ static int lxc_spawn(struct lxc_handler *handler)
 		return -1;
 	}
+	if (conf->shmount.path_host) {
+		if (!conf->shmount.path_cont) {
+			lxc_sync_fini(handler);
+			return -1;
+		}
+		ret = lxc_setup_shmount(conf);
+		if (ret < 0) {
+			ERROR("Failed to setup shared mount point");
+			lxc_sync_fini(handler);
+			return -1;
+		}
+	}
 	if (handler->ns_clone_flags & CLONE_NEWNET) {
 		if (!lxc_list_empty(&conf->network)) {
@@ -1683,26 +1697,11 @@ static int lxc_spawn(struct lxc_handler *handler)
 			ret = lxc_create_network_priv(handler);
 			if (ret < 0) {
 				ERROR("Failed to create the network");
-				lxc_sync_fini(handler);
+				goto out_delete_net;
-				return -1;
 			}
 		}
 	}
-	if (conf->shmount.path_host) {
-		if (!conf->shmount.path_cont) {
-			lxc_sync_fini(handler);
-			return -1;
-		}
-		ret = lxc_setup_shmount(conf);
-		if (ret < 0) {
-			ERROR("Failed to setup shared mount point");
-			lxc_sync_fini(handler);
-			return -1;
-		}
-	}
 	if (!cgroup_init(handler)) {
 		ERROR("Failed initializing cgroup support");
 		goto out_delete_net;