diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-08 12:59:52 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-09 08:07:09 +0200 |
| commit | 20345a86b7157e229c1c7e3976005548bad159a4 (patch) | |
| tree | 02021dbcdd2e85a6b62cdbc691d9d51a0ffa179a /mkosi.conf.d/10-centos | |
| parent | mkosi: policykit-1 was renamed to polkitd (diff) | |
| download | systemd-20345a86b7157e229c1c7e3976005548bad159a4.tar.xz systemd-20345a86b7157e229c1c7e3976005548bad159a4.zip | |
mkosi: Adapt configuration to take into account configuration rework
In https://github.com/systemd/mkosi/pull/2847, the '@' specifier is
removed, CLI arguments take priority over configuration files again
and the "main" image is defined at the top level instead of in
mkosi.images/. Additionally, not every setting from the top level
configuration is inherited by the images in mkosi.images/ anymore,
only settings which make sense to be inherited are inherited.
This commit gets rid of all the usages of '@', moves the "main" image
configuration from mkosi.images/system to the top level and gets rid
of various hacks we had in place to deal with quirks of the old
configuration parsing logic.
We also remove usages of Images= and --append as these options are
removed by the mentioned PR.
Diffstat (limited to 'mkosi.conf.d/10-centos')
| -rw-r--r-- | mkosi.conf.d/10-centos/mkosi.conf | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/10-centos/mkosi.conf new file mode 100644 index 0000000000..66aa0611d6 --- /dev/null +++ b/mkosi.conf.d/10-centos/mkosi.conf @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=centos + +[Distribution] +Release=9 +Repositories=epel + epel-next + hyperscale-packages-main + hyperscale-packages-experimental + +[Content] +Environment= + Environment= + # We'd prefer to use XFS here but it fails to mount on duplicate filesystem UUIDs which + # happens when running tests in parallel so we use ext4 instead. + SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=ext4 + # The kernel versions in CentOS Stream 9 doesn't support orphan_file, but later versions of + # mkfs.ext4 enabled it by default, so we disable it explicitly. + SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file" + + GIT_URL=https://git.centos.org/rpms/systemd.git + GIT_BRANCH=c9s-sig-hyperscale + GIT_COMMIT=8cf2aed0181920611421384f7374720db269d6c7 + +Packages= + kernel-modules # For squashfs + rpmautospec-rpm-macros |