From 4e3f16b5ef122996f9545d883af74ff1235833eb Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 11 Oct 2024 15:52:48 +0900
Subject: [PATCH] mkosi: replace PackageManagerTrees= with SandboxTrees=

---
 mkosi.conf.d/10-debian-ubuntu/mkosi.conf         | 4 ++--
 mkosi.conf.d/10-opensuse/mkosi.conf              | 4 +++-
 mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf | 4 ++--
 mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf     | 4 ++--
 test/README.testsuite                            | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 472064e45d0..46dd98828f4 100644
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -4,8 +4,8 @@
 Distribution=|debian
 Distribution=|ubuntu
 
-[Distribution]
-PackageManagerTrees=mkosi-pinning.pref:/etc/apt/preferences.d/mkosi-pinning.pref
+[Build]
+SandboxTrees=mkosi-pinning.pref:/etc/apt/preferences.d/mkosi-pinning.pref
 
 [Content]
 VolatilePackages=
diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.conf.d/10-opensuse/mkosi.conf
index dc9bf304290..8a08b1f8c7f 100644
--- a/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -6,7 +6,9 @@ Distribution=opensuse
 [Distribution]
 Release=tumbleweed
 Repositories=non-oss
-PackageManagerTrees=macros.db_backend:/etc/rpm/macros.db_backend
+
+[Build]
+SandboxTrees=macros.db_backend:/etc/rpm/macros.db_backend
 
 [Content]
 VolatilePackages=
diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
index 582f038b5f1..8e0e3c0d785 100644
--- a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
+++ b/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
@@ -6,5 +6,5 @@ Architecture=!x86-64
 Architecture=!x86
 Release=noble
 
-[Distribution]
-PackageManagerTrees=noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
+[Build]
+SandboxTrees=noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf b/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
index 7347be90692..e0e96b2c184 100644
--- a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
+++ b/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
@@ -6,5 +6,5 @@ Architecture=|x86-64
 Architecture=|x86
 Release=noble
 
-[Distribution]
-PackageManagerTrees=noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
+[Build]
+SandboxTrees=noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
diff --git a/test/README.testsuite b/test/README.testsuite
index 8cacbb40af0..a513d1c6b9c 100644
--- a/test/README.testsuite
+++ b/test/README.testsuite
@@ -25,7 +25,7 @@ Environment=NO_BUILD=1
 You might also want to use the `PackageDirectories=` or `Repositories=` option to provide
 mkosi with a directory or repository containing the systemd packages that should be installed
 instead. If the repository containing the systemd packages is not a builtin repository known
-by mkosi, you can use the `PackageManagerTrees=` option to write an extra repository definition
+by mkosi, you can use the `SandboxTrees=` option to write an extra repository definition
 to /etc which is used when building the image instead.
 
 Next, we can build the integration test image with meson: