Skip to content

L
lxc
Commit 99a6af52 by Michel Normand Committed by Daniel Lezcano
Options

lxc: child failing before container rename

do the same checking as already done in lxc/restart.c Signed-off-by: 's avatarMichel Normand <normand@fr.ibm.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 7d163508
Showing with 7 additions and 3 deletions
src/lxc/start.c
...@@ -436,6 +436,7 @@ int lxc_spawn(const char *name, struct lxc_handler *handler, char *const argv[]) ...@@ -436,6 +436,7 @@ int lxc_spawn(const char *name, struct lxc_handler *handler, char *const argv[])
int sv[2]; int sv[2];
int clone_flags; int clone_flags;
int err = -1, sync; int err = -1, sync;
int failed_before_rename = 0;
struct start_arg start_arg = { struct start_arg start_arg = {
.name = name, .name = name,
...@@ -474,14 +475,17 @@ int lxc_spawn(const char *name, struct lxc_handler *handler, char *const argv[]) ...@@ -474,14 +475,17 @@ int lxc_spawn(const char *name, struct lxc_handler *handler, char *const argv[])
close(sv[0]); close(sv[0]);
/* Wait for the child to be ready */ /* Wait for the child to be ready */
if (read(sv[1], &sync, sizeof(sync)) < 0) { if (read(sv[1], &sync, sizeof(sync)) <= 0) {
SYSERROR("failed to read the socket"); ERROR("sync read failure : %m");
goto out_delete_net; failed_before_rename = 1;
} }
if (lxc_rename_nsgroup(name, handler)) if (lxc_rename_nsgroup(name, handler))
goto out_delete_net; goto out_delete_net;
if (failed_before_rename)
goto out_delete_net;
/* Create the network configuration */ /* Create the network configuration */
if (clone_flags & CLONE_NEWNET) { if (clone_flags & CLONE_NEWNET) {
if (lxc_assign_network(&handler->conf->network, handler->pid)) { if (lxc_assign_network(&handler->conf->network, handler->pid)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment