Exit on errors in restore()'s worker

If we just return here, we end up with two processes executing the caller's code, which is not good. Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Exit on errors in restore()'s worker
6d5b330d · Tycho Andersen · Stéphane Graber · 5f845c92 · 6d5b330d
Commit 6d5b330d authored Sep 02, 2014 by Tycho Andersen Committed by Stéphane Graber Sep 19, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

lxccontainer.c src/lxc/lxccontainer.c +4 -4

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3830,7 +3830,7 @@ static bool lxcapi_restore(struct lxc_container *c, char *directory, bool verbos
 		struct criu_opts os;
 		if (unshare(CLONE_NEWNS))
-			return false;
+			exit(1);
 		/* CRIU needs the lxc root bind mounted so that it is the root of some
 		 * mount. */
@@ -3838,15 +3838,15 @@ static bool lxcapi_restore(struct lxc_container *c, char *directory, bool verbos
 		if (rootfs_is_blockdev(c->lxc_conf)) {
 			if (do_rootfs_setup(c->lxc_conf, c->name, c->config_path) < 0)
-				return false;
+				exit(1);
 		}
 		else {
 			if (mkdir(rootfs->mount, 0755) < 0 && errno != EEXIST)
-				return false;
+				exit(1);
 			if (mount(rootfs->path, rootfs->mount, NULL, MS_BIND, NULL) < 0) {
 				rmdir(rootfs->mount);
-				return false;
+				exit(1);
 			}
 		}