From d9e2daaf3d8649650cf9784b4fe9d9de4507da0c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Apr 2015 10:57:17 +0200
Subject: btrfs: support recursively removing btrfs snapshots

---
 src/import/pull-common.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/import/pull-common.c')

diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index d4cebe205e..ee0c064dfc 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -124,10 +124,8 @@ int pull_make_local_copy(const char *final, const char *image_root, const char *
 
         p = strjoina(image_root, "/", local);
 
-        if (force_local) {
-                (void) btrfs_subvol_remove(p);
-                (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL);
-        }
+        if (force_local)
+                (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
 
         r = btrfs_subvol_snapshot(final, p, false, false);
         if (r == -ENOTTY) {
-- 
cgit v1.2.3-54-g00ecf