mkosi: replace PackageManagerTrees= with SandboxTrees=

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 472064e45d01933a8e5247aecc403cf493f3d8d2..46dd98828f4a6122db3b5746f3df51956d3489d7 100644 (file)
--- 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 dc9bf304290c7796a4751abcca9fe78e844d0ad0..8a08b1f8c7f7f4605f34041e4ad35013d2cc09da 100644 (file)
--- 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 582f038b5f1464ec5a2ccbfa15c162383ee6d2f5..8e0e3c0d7858339dc28b553eef0824724999abb1 100644 (file)
--- 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 7347be90692e99fdd0f0a13831d5709daa8090e2..e0e96b2c1848c492bec7f2beb567e3700c0d5515 100644 (file)
--- 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 8cacbb40af01d690c611bf19e1b732799b7373de..a513d1c6b9c3d7657fb009bf3525804d26c5e1eb 100644 (file)
--- 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: