From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 15 Aug 2017 16:07:56 +0000 (+0200)
Subject: Revert "storage: switch to new rsync functions"
X-Git-Tag: lxc-2.0.9~98^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b73513b8b9ca220a031a896860890217ad01dc93;p=thirdparty%2Flxc.git

Revert "storage: switch to new rsync functions"

This reverts commit a493a694166e65edbf412433a605042cc0ac3d0e.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/bdev/bdev.c b/src/lxc/bdev/bdev.c
index a52357262..15a275065 100644
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/bdev/bdev.c
@@ -326,6 +326,7 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
 		       const char *bdevdata, uint64_t newsize, int *needs_rdep)
 {
 	struct bdev *orig, *new;
+	pid_t pid;
 	int ret;
 	char *src_no_prefix;
 	bool snap = flags & LXC_CLONE_SNAPSHOT;
@@ -335,7 +336,6 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
 	const char *oldname = c0->name;
 	const char *oldpath = c0->config_path;
 	struct rsync_data data;
-	char cmd_output[MAXPATHLEN];
 
 	/* If the container name doesn't show up in the rootfs path, then we
 	 * don't know how to come up with a new name.
@@ -475,28 +475,33 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
 		return new;
 
 	/* rsync the contents from source to target */
-	data.orig = orig;
-	data.new = new;
-	if (am_unpriv()) {
-		ret = userns_exec_1(c0->lxc_conf, lxc_rsync_exec_wrapper, &data,
-				    "lxc_rsync_exec_wrapper");
-		if (ret < 0) {
-			ERROR("Failed to rsync from \"%s\" into \"%s\"",
-			      orig->dest, new->dest);
-			goto err;
-		}
-	} else {
-		ret = run_command(cmd_output, sizeof(cmd_output),
-				  lxc_rsync_exec_wrapper, (void *)&data);
+	pid = fork();
+	if (pid < 0) {
+		SYSERROR("fork");
+		goto err;
+	}
+
+	if (pid > 0) {
+		int ret = wait_for_pid(pid);
+		bdev_put(orig);
 		if (ret < 0) {
-			ERROR("Failed to rsync from \"%s\" into \"%s\": %s",
-			      orig->dest, new->dest, cmd_output);
-			goto err;
+			bdev_put(new);
+			return NULL;
 		}
+		return new;
 	}
 
-	bdev_put(orig);
-	return new;
+	data.orig = orig;
+	data.new = new;
+	if (am_unpriv())
+		ret = userns_exec_1(c0->lxc_conf, rsync_rootfs_wrapper, &data,
+				    "rsync_rootfs_wrapper");
+	else
+		ret = rsync_rootfs(&data);
+	if (ret < 0)
+		ERROR("Failed to rsync from");
+
+	exit(ret == 0 ? 0 : 1);
 
 err:
 	bdev_put(orig);