diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-16 12:07:38 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-16 13:59:47 +0200 |
| commit | 68ee9771145464949d36d62a0ec687ecfb39290a (patch) | |
| tree | 3be069837c9202c134100bf1bee43253797b2323 /mkosi.conf | |
| parent | mkosi: Drop CacheOnly=always from two subimages (diff) | |
| download | systemd-68ee9771145464949d36d62a0ec687ecfb39290a.tar.xz systemd-68ee9771145464949d36d62a0ec687ecfb39290a.zip | |
mkosi: Build initrd as a subimage
Let's make things a little more consistent and build the initrd
explicitly as a subimage as well instead of relying on mkosi building
it as part of the main image build.
We drop the opensuse initrd postinst script as we don't use erofs by
default anymore. We can always reintroduce it again later if needed.
Diffstat (limited to 'mkosi.conf')
| -rw-r--r-- | mkosi.conf | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mkosi.conf b/mkosi.conf index cafd563c35..86ee19e1fc 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -2,9 +2,9 @@ [Config] MinimumVersion=23~devel -InitrdInclude=mkosi.initrd/ Dependencies= exitrd + initrd minimal-base minimal-0 minimal-1 @@ -45,6 +45,8 @@ ExtraTrees= %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template %O/exitrd:/exitrd +Initrds=%O/initrd + Environment= SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F @@ -83,11 +85,6 @@ KernelCommandLine=systemd.crash_shell KernelModulesInitrdExclude=.* KernelModulesInitrdInclude=default -InitrdPackages= - findutils - grep - sed - Packages= acl attr |