Merge pull request #2052 from brauner/2017-12-19/unprivileged_btrfs_regression

btrfs: fix unprivileged snapshot creation

Merge pull request #2052 from brauner/2017-12-19/unprivileged_btrfs_regression
da5f5e3f · Serge Hallyn · GitHub · b5b200c6 · 4aaf9b81 · da5f5e3f
Unverified Commit da5f5e3f authored Dec 21, 2017 by Serge Hallyn Committed by GitHub Dec 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

btrfs.c src/lxc/storage/btrfs.c +2 -2

No files found.
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -469,11 +469,11 @@ bool btrfs_create_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
 	if (am_unpriv()) {
 		struct rsync_data_char args;

-		args.src = orig->dest;
+		args.src = orig->src;
 		args.dest = new->dest;

 		ret = userns_exec_1(conf, btrfs_snapshot_wrapper, &args,
-				"btrfs_snapshot_wrapper");
+				    "btrfs_snapshot_wrapper");
 		if (ret < 0) {
 			ERROR("Failed to run \"btrfs_snapshot_wrapper\"");
 			return false;