mkosi: Remove usage of deprecated option names/sections

diff --git a/docs/HACKING.md b/docs/HACKING.md
index a74d0468e5e2f81176807e12e5dc5276e60157e9..2015a40193836fe6b86f0d68f5a19cc640f0225c 100644 (file)
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -66,7 +66,7 @@ reuse the host's package cache. To do this, create a mkosi override file in
 mkosi.default.d/ (e.g 20-local.conf) and add the following contents:
 
 ```
-[Packages]
+[Content]
 Cache=<full-path-to-package-manager-cache> # (e.g. /var/cache/dnf)
 ```
 
@@ -229,7 +229,7 @@ mkosi's config. The easiest way to set the option is to create a file 20-local.c
 add the following contents:
 
 ```
-[Packages]
+[Content]
 IncludeDirectory=mkosi.includedir
 ```
 
@@ -238,7 +238,7 @@ We already configured clangd to map any paths in /usr/include in the build image
 host in the mkosi-clangd.sh script.
 
 We also need to make sure clangd is installed in the build image. To have mkosi install clangd in the build
-image, edit the 20-local.conf file we created earlier and add the following contents under the `[Packages]`
+image, edit the 20-local.conf file we created earlier and add the following contents under the `[Content]`
 section:
 
 ```

diff --git a/mkosi.default.d/10-systemd.conf b/mkosi.default.d/10-systemd.conf
index 24b85ddd0bb3eae64fdcd04f210f69f8bc316389..58b84cae98b814f8d6366bd0cf770e1b0c804f84 100644 (file)
--- a/mkosi.default.d/10-systemd.conf
+++ b/mkosi.default.d/10-systemd.conf
@@ -9,7 +9,7 @@ HostonlyInitrd=yes
 # Prevent ASAN warnings when building the image
 Environment=ASAN_OPTIONS=verify_asan_link_order=false
 
-[Packages]
+[Content]
 BuildDirectory=mkosi.builddir
 Cache=mkosi.cache
 InstallDirectory=mkosi.installdir
@@ -17,7 +17,7 @@ SourceFileTransferFinal=copy-git-others
 
 [Host]
 QemuHeadless=yes
-NetworkVeth=yes
+Netdev=yes
 QemuMem=2G
 
 [Validation]

diff --git a/mkosi.default.d/arch/10-mkosi.arch b/mkosi.default.d/arch/10-mkosi.arch
index 822da035d8025302dd2b576f4bc0fc5b859f67c9..12f46c71c70650cea49970328baeac6f8aec4e1e 100644 (file)
--- a/mkosi.default.d/arch/10-mkosi.arch
+++ b/mkosi.default.d/arch/10-mkosi.arch
@@ -8,7 +8,7 @@
 [Distribution]
 Distribution=arch
 
-[Packages]
+[Content]
 BuildPackages=
         acl
         bzip2

diff --git a/mkosi.default.d/centos_epel/10-mkosi.centos_epel b/mkosi.default.d/centos_epel/10-mkosi.centos_epel
index 086fcdb555e13a28a4974e126e308f1225522eb3..5e726d4aef551458f902718288fbac83b38ebb9d 100644 (file)
--- a/mkosi.default.d/centos_epel/10-mkosi.centos_epel
+++ b/mkosi.default.d/centos_epel/10-mkosi.centos_epel
@@ -10,7 +10,7 @@ Distribution=centos_epel
 Format=gpt_xfs
 HostonlyInitrd=no
 
-[Packages]
+[Content]
 BuildPackages=
         diffutils
         docbook-style-xsl

diff --git a/mkosi.default.d/debian/10-mkosi.debian b/mkosi.default.d/debian/10-mkosi.debian
index 9b77b5b832695611f42ab5e63f3ef55e71c31ec4..2488eeb557ecbf54b7e216f07441d85e98d2a94b 100644 (file)
--- a/mkosi.default.d/debian/10-mkosi.debian
+++ b/mkosi.default.d/debian/10-mkosi.debian
@@ -7,7 +7,7 @@
 Distribution=debian
 Release=testing
 
-[Packages]
+[Content]
 BuildPackages=
         acl
         clang

diff --git a/mkosi.default.d/fedora/10-mkosi.fedora b/mkosi.default.d/fedora/10-mkosi.fedora
index 0314a2faab3affd006b0ec64a47d68900fae2698..c1d8a5755757cda4767354aa6ccb0f975ea374be 100644 (file)
--- a/mkosi.default.d/fedora/10-mkosi.fedora
+++ b/mkosi.default.d/fedora/10-mkosi.fedora
@@ -7,7 +7,7 @@
 Distribution=fedora
 Release=36
 
-[Packages]
+[Content]
 BuildPackages=
         diffutils
         docbook-style-xsl

diff --git a/mkosi.default.d/opensuse/10-mkosi.opensuse b/mkosi.default.d/opensuse/10-mkosi.opensuse
index b1ca38175940df7d6abc482c16fe8858d8c68301..16fdecdedef2eac933cdacf5550815f7eabb109e 100644 (file)
--- a/mkosi.default.d/opensuse/10-mkosi.opensuse
+++ b/mkosi.default.d/opensuse/10-mkosi.opensuse
@@ -7,7 +7,7 @@
 Distribution=opensuse
 Release=tumbleweed
 
-[Packages]
+[Content]
 BuildPackages=
         docbook-xsl-stylesheets
         fdupes

diff --git a/mkosi.default.d/ubuntu/10-mkosi.ubuntu b/mkosi.default.d/ubuntu/10-mkosi.ubuntu
index dfb0ec0fd5f32763dbd5903a2fb15c6419cb2f0c..9492e791cd7ec5092e40c4083c06b64a62b0d9c0 100644 (file)
--- a/mkosi.default.d/ubuntu/10-mkosi.ubuntu
+++ b/mkosi.default.d/ubuntu/10-mkosi.ubuntu
@@ -8,7 +8,7 @@ Distribution=ubuntu
 Release=jammy
 Repositories=main,universe
 
-[Packages]
+[Content]
 BuildPackages=
         acl
         docbook-xml

diff --git a/test/mkosi.default.networkd-test b/test/mkosi.default.networkd-test
index 6423417b81c12fe9d11b619642dfb053f6f2a180..ed3604ccdf1cd233caf7749886287af6567e22b6 100644 (file)
--- a/test/mkosi.default.networkd-test
+++ b/test/mkosi.default.networkd-test
@@ -21,7 +21,7 @@ Output=networkd-test.raw
 [Partitions]
 RootSize=3G
 
-[Packages]
+[Content]
 BuildPackages=
         audit-libs-devel
         bzip2-devel