storage: use userns_exec_full()

Closes #1800.

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

diff --git a/src/lxc/storage/aufs.c b/src/lxc/storage/aufs.c
index f3618150bc1c5043ca424817f9893e2eaae18c41..567a597f6932a3c938abd0c3718f7b038308fa4e 100644 (file)
--- a/src/lxc/storage/aufs.c
+++ b/src/lxc/storage/aufs.c
@@ -136,8 +136,8 @@ int aufs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
                rdata.src = odelta;
                rdata.dest = ndelta;
                if (am_unpriv())
-                       ret = userns_exec_1(conf, rsync_delta_wrapper, &rdata,
-                                           "rsync_delta_wrapper");
+                       ret = userns_exec_full(conf, rsync_delta_wrapper,
+                                              &rdata, "rsync_delta_wrapper");
                else
                        ret = rsync_delta(&rdata);
                if (ret) {

diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index b63ebba20c70ddb1e8cce81e25ec8598a687cb7a..2537e9efc1812462535bfa317ec1f9a80f4185b4 100644 (file)
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -397,8 +397,8 @@ int btrfs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
                        return btrfs_snapshot(orig->dest, new->dest);
                sdata.dest = new->dest;
                sdata.src = orig->dest;
-               return userns_exec_1(conf, btrfs_snapshot_wrapper, &sdata,
-                                    "btrfs_snapshot_wrapper");
+               return userns_exec_full(conf, btrfs_snapshot_wrapper, &sdata,
+                                       "btrfs_snapshot_wrapper");
        }
 
        if (rmdir(new->dest) < 0 && errno != ENOENT) {

diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c
index d939b34f27385c17b878fcc1ad0002327b6a74df..770821663aceddfe2f2f619be7b3413469fba95e 100644 (file)
--- a/src/lxc/storage/overlay.c
+++ b/src/lxc/storage/overlay.c
@@ -752,8 +752,8 @@ static int ovl_do_rsync(struct lxc_storage *orig, struct lxc_storage *new,
        rdata.orig = orig;
        rdata.new = new;
        if (am_unpriv())
-               ret = userns_exec_1(conf, ovl_rsync_wrapper, &rdata,
-                                   "ovl_rsync_wrapper");
+               ret = userns_exec_full(conf, ovl_rsync_wrapper, &rdata,
+                                      "ovl_rsync_wrapper");
        else
                ret = ovl_rsync(&rdata);
        if (ret)

diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
index adf5af8b23b6710127d266d865d5dae9d23df92c..820fd24078e143b84f98a11a1d75c14f0bc5ec9c 100644 (file)
--- a/src/lxc/storage/storage.c
+++ b/src/lxc/storage/storage.c
@@ -454,8 +454,8 @@ struct lxc_storage *storage_copy(struct lxc_container *c0, const char *cname,
        data.orig = orig;
        data.new = new;
        if (am_unpriv())
-               ret = userns_exec_1(c0->lxc_conf, rsync_rootfs_wrapper, &data,
-                                   "rsync_rootfs_wrapper");
+               ret = userns_exec_full(c0->lxc_conf, rsync_rootfs_wrapper,
+                                      &data, "rsync_rootfs_wrapper");
        else
                ret = rsync_rootfs(&data);
 

diff --git a/src/lxc/storage/storage.h b/src/lxc/storage/storage.h
index 6557377597e1b84f305d7815b80379e21dbdb528..6011574c0992bd3869616b138ccd5d8660796c26 100644 (file)
--- a/src/lxc/storage/storage.h
+++ b/src/lxc/storage/storage.h
@@ -128,7 +128,6 @@ extern struct lxc_storage *storage_create(const char *dest, const char *type,
 extern void storage_put(struct lxc_storage *bdev);
 extern bool storage_destroy(struct lxc_conf *conf);
 
-/* callback function to be used with userns_exec_1() */
 extern int storage_destroy_wrapper(void *data);
 extern bool rootfs_is_blockdev(struct lxc_conf *conf);