From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 4 Apr 2024 10:06:15 +0000 (+0200)
Subject: Add missing sandbox
X-Git-Tag: v23~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b954a54d234749ce4e6d0e2e0b6cc9731db13936;p=thirdparty%2Fmkosi.git

Add missing sandbox
---

diff --git a/mkosi/tree.py b/mkosi/tree.py
index c774579ab..53a8ae550 100644
--- a/mkosi/tree.py
+++ b/mkosi/tree.py
@@ -149,7 +149,10 @@ def rmtree(*paths: Path, tools: Path = Path("/"), sandbox: SandboxProtocol = nos
     if not paths:
         return
 
-    if find_binary("btrfs", root=tools) and (subvolumes := sorted({p for p in paths if is_subvolume(p)})):
+    if (
+        find_binary("btrfs", root=tools) and
+        (subvolumes := sorted({p for p in paths if is_subvolume(p, sandbox=sandbox)}))
+    ):
         # Silence and ignore failures since when not running as root, this will fail with a permission error unless the
         # btrfs filesystem is mounted with user_subvol_rm_allowed.
         run(["btrfs", "subvolume", "delete", *subvolumes],