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.
This commit is contained in:
Malte Poll 2023-10-17 12:44:19 +02:00 committed by GitHub
parent abbe3853cb
commit bad9edb99b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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