From bad9edb99b2555f9b1c0cae15236a1f5bafb8d91 Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:44:19 +0200
Subject: [PATCH] image: move mkosi settings into their actual sections (#2471)

mkosi now warns about what settings are defined in what sections.
Soon, the config parsing might fail when settings are in the wrong sections.
---
 image/base/mkosi.conf   | 4 ++--
 image/initrd/mkosi.conf | 4 ++--
 image/system/mkosi.conf | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/image/base/mkosi.conf b/image/base/mkosi.conf
index a29954785..3f041eac2 100644
--- a/image/base/mkosi.conf
+++ b/image/base/mkosi.conf
@@ -4,9 +4,10 @@ Release=38
 
 [Output]
 Format=tar
-SourceDateEpoch=0
+Seed=b04a9a33-4559-4af4-8b38-9249cf933229
 
 [Content]
+SourceDateEpoch=0
 Bootable=no
 Packages=systemd
          systemd-boot
@@ -67,4 +68,3 @@ RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts
 RemoveFiles=/etc/issue
 RemoveFiles=/etc/issue.net
 CleanPackageMetadata=true
-Seed=b04a9a33-4559-4af4-8b38-9249cf933229
diff --git a/image/initrd/mkosi.conf b/image/initrd/mkosi.conf
index 45c315cfe..173691555 100644
--- a/image/initrd/mkosi.conf
+++ b/image/initrd/mkosi.conf
@@ -5,9 +5,10 @@ Release=38
 [Output]
 Format=cpio
 Output=image
-SourceDateEpoch=0
+Seed=b04a9a33-4559-4af4-8b38-9249cf933229
 
 [Content]
+SourceDateEpoch=0
 MakeInitrd=yes
 Bootable=no
 Packages=systemd
@@ -38,4 +39,3 @@ RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts
 # https://github.com/authselect/authselect/pull/348
 # RemoveFiles=/etc/authselect/*
 CleanPackageMetadata=true
-Seed=b04a9a33-4559-4af4-8b38-9249cf933229
diff --git a/image/system/mkosi.conf b/image/system/mkosi.conf
index 317899e82..c45f0cc23 100644
--- a/image/system/mkosi.conf
+++ b/image/system/mkosi.conf
@@ -8,9 +8,9 @@ ManifestFormat=json
 Output=constellation
 ImageId=constellation
 Seed=0e9a6fe0-68f6-408c-bbeb-136054d20445
-SourceDateEpoch=0
 
 [Content]
+SourceDateEpoch=0
 Bootable=yes
 Bootloader=uki
 KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8 console=ttyS0