Merge pull request #29035 from DaanDeMeyer/update-mkosi

author Daan De Meyer <daan.j.demeyer@gmail.com>

Tue, 5 Sep 2023 14:56:35 +0000 (16:56 +0200)

committer GitHub <noreply@github.com>

Tue, 5 Sep 2023 14:56:35 +0000 (16:56 +0200)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Tue, 5 Sep 2023 14:56:35 +0000 (16:56 +0200)
committer GitHub <noreply@github.com>
Tue, 5 Sep 2023 14:56:35 +0000 (16:56 +0200)
diff --cc mkosi.presets/initrd/mkosi.conf

index 6099e2e3e16dbcc7ccf53a69bade602a9cf27a74,949044fcb38c8102284cb36a4913d6d313097554..5d347b71d81d7bc2656c55910ea1776098442dd4
--- 1/mkosi.presets/initrd/mkosi.conf
--- 2/mkosi.presets/initrd/mkosi.conf
+++ b/mkosi.presets/initrd/mkosi.conf
@@@ -14,8 -14,11 +14,12 @@@ Format=cpi
   BaseTrees=../../mkosi.output/base
   ExtraTrees=../../mkosi.output/base-systemd
   MakeInitrd=yes
+ Bootable=no
+ BuildPackages=
+ 
+ Packages=
   Packages=
+ +        gzip
           systemd
           udev
   
diff --cc mkosi.presets/system/mkosi.conf
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Tue, 5 Sep 2023 14:56:35 +0000 (16:56 +0200)
committer	GitHub <noreply@github.com>
	Tue, 5 Sep 2023 14:56:35 +0000 (16:56 +0200)
		1	2
mkosi.presets/initrd/mkosi.conf	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi.presets/system/mkosi.conf	patch \|	diff1 \|	diff2 \|	blob \| history