mirror of
https://github.com/edgelesssys/constellation.git
synced 2024-10-01 01:36:09 -04:00
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:
parent
abbe3853cb
commit
bad9edb99b
@ -4,9 +4,10 @@ Release=38
|
|||||||
|
|
||||||
[Output]
|
[Output]
|
||||||
Format=tar
|
Format=tar
|
||||||
SourceDateEpoch=0
|
Seed=b04a9a33-4559-4af4-8b38-9249cf933229
|
||||||
|
|
||||||
[Content]
|
[Content]
|
||||||
|
SourceDateEpoch=0
|
||||||
Bootable=no
|
Bootable=no
|
||||||
Packages=systemd
|
Packages=systemd
|
||||||
systemd-boot
|
systemd-boot
|
||||||
@ -67,4 +68,3 @@ RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts
|
|||||||
RemoveFiles=/etc/issue
|
RemoveFiles=/etc/issue
|
||||||
RemoveFiles=/etc/issue.net
|
RemoveFiles=/etc/issue.net
|
||||||
CleanPackageMetadata=true
|
CleanPackageMetadata=true
|
||||||
Seed=b04a9a33-4559-4af4-8b38-9249cf933229
|
|
||||||
|
@ -5,9 +5,10 @@ Release=38
|
|||||||
[Output]
|
[Output]
|
||||||
Format=cpio
|
Format=cpio
|
||||||
Output=image
|
Output=image
|
||||||
SourceDateEpoch=0
|
Seed=b04a9a33-4559-4af4-8b38-9249cf933229
|
||||||
|
|
||||||
[Content]
|
[Content]
|
||||||
|
SourceDateEpoch=0
|
||||||
MakeInitrd=yes
|
MakeInitrd=yes
|
||||||
Bootable=no
|
Bootable=no
|
||||||
Packages=systemd
|
Packages=systemd
|
||||||
@ -38,4 +39,3 @@ RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts
|
|||||||
# https://github.com/authselect/authselect/pull/348
|
# https://github.com/authselect/authselect/pull/348
|
||||||
# RemoveFiles=/etc/authselect/*
|
# RemoveFiles=/etc/authselect/*
|
||||||
CleanPackageMetadata=true
|
CleanPackageMetadata=true
|
||||||
Seed=b04a9a33-4559-4af4-8b38-9249cf933229
|
|
||||||
|
@ -8,9 +8,9 @@ ManifestFormat=json
|
|||||||
Output=constellation
|
Output=constellation
|
||||||
ImageId=constellation
|
ImageId=constellation
|
||||||
Seed=0e9a6fe0-68f6-408c-bbeb-136054d20445
|
Seed=0e9a6fe0-68f6-408c-bbeb-136054d20445
|
||||||
SourceDateEpoch=0
|
|
||||||
|
|
||||||
[Content]
|
[Content]
|
||||||
|
SourceDateEpoch=0
|
||||||
Bootable=yes
|
Bootable=yes
|
||||||
Bootloader=uki
|
Bootloader=uki
|
||||||
KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8 console=ttyS0
|
KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8 console=ttyS0
|
||||||
|
Loading…
Reference in New Issue
Block a user