From: Tycho Andersen Date: Fri, 24 Apr 2015 20:46:08 +0000 (-0600) Subject: c/r: check for criu images in the checkpoint directory X-Git-Tag: lxc-2.0.0.beta1~294 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c50991da2a5b20756bdfbc5a147b14690855b7;p=thirdparty%2Flxc.git c/r: check for criu images in the checkpoint directory CRIU can get confused if there are two dumps that are written to the same directory, so we make some minimal effort to prevent people from doing this. This is a better alternative than forcing liblxc to create the directory, since it is mostly race free (and neither solution is bullet proof anyway if someone rsyncs some bad images over the top of the good ones). Signed-off-by: Tycho Andersen Acked-by: Serge E. Hallyn --- diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index dbcee99ce..8999f4423 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -3683,6 +3683,7 @@ static bool do_lxcapi_checkpoint(struct lxc_container *c, char *directory, bool { pid_t pid; int status; + char path[PATH_MAX]; if (!criu_ok(c)) return false; @@ -3690,6 +3691,15 @@ static bool do_lxcapi_checkpoint(struct lxc_container *c, char *directory, bool if (mkdir(directory, 0700) < 0 && errno != EEXIST) return false; + status = snprintf(path, sizeof(path), "%s/inventory.img", directory); + if (status < 0 || status >= sizeof(path)) + return false; + + if (access(path, F_OK) == 0) { + ERROR("please use a fresh directory for the dump directory\n"); + return false; + } + if (!dump_net_info(c, directory)) return false;