The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/2052
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
We already fixed privileged btrfs snapshot creation in:
commit 1c7222c084769a1d9406ca7dab943d8a5f016a56
Author: Christian Brauner <christian.brau...@ubuntu.com>
Date: Tue Nov 28 13:51:03 2017 +0100
btrfs: fix btrfs_snapshot()
Closes #1956.
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
Signed-off-by: Adrian Reber <are...@redhat.com>
but missed unprivileged btrfs snapshot creation. Fix it too.
Follow-up to #1956.
Closes #2051.
Reported-by: Oleg Freedhom overla...@gmail.com
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 4aaf9b81e9e1199a03d6d038d9350b145efa54b2 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Tue, 19 Dec 2017 11:59:52 +0100
Subject: [PATCH] btrfs: fix unprivileged snapshot creation
We already fixed privileged btrfs snapshot creation in:
commit 1c7222c084769a1d9406ca7dab943d8a5f016a56
Author: Christian Brauner <christian.brau...@ubuntu.com>
Date: Tue Nov 28 13:51:03 2017 +0100
btrfs: fix btrfs_snapshot()
Closes #1956.
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
Signed-off-by: Adrian Reber <are...@redhat.com>
but missed unprivileged btrfs snapshot creation. Fix it too.
Follow-up to #1956.
Closes #2051.
Reported-by: Oleg Freedhom overla...@gmail.com
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
src/lxc/storage/btrfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index 143a0c933..ec7ba62ee 100644
--- 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;
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
