shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code
d51236d833
systemd/mkosi.conf

144 lines
3.6 KiB
Plaintext
Raw Normal View History

Move shared mkosi settings to a single file in mkosi.default.d/
2021-01-03 18:05:06 +03:00
# SPDX-License-Identifier: LGPL-2.1-or-later
Update to mkosi v19 - Use mkosi.images/ instead of mkosi.presets/ - Use the .chroot suffix to run scripts in the image - Use BuildSources= match for the kernel build - Move 10-systemd.conf to mkosi.conf and rely on mkosi.local.conf for local configuration
2023-11-28 20:38:22 +03:00
[Config]
mkosi: bump mkosi MinimumVersion dbff64ddf06f64ab94bd314df27d6c089b75de52 bumped the hash to a commit after 24.3, so let's tell the users that 25~devel is the minimum required. (cherry picked from commit 3a157e7cb4b1ec6fb822a014d67161ecfee546a2)
2024-09-20 17:14:08 +03:00
MinimumVersion=25~devel
mkosi: Introduce build image We want the exitrd image to be built with the latest systemd as well. As the exitrd image is built as part of mkosi.images, and all subimages are built before the main image, this implies the packages must be built as a subimage in mkosi.images/ as well. So we introduce the build image and move all logic related to building distribution packages there. This also has the nice side effect of slimming down the main image as the build dependencies are not installed into the main image anymore. It also makes sure the packages are built in a "clean" chroot without any of the other packages which we install in the main image available. (cherry picked from commit 7205fc7dc31eb2be3075ee6ba23ebe84324aa5cb)
2024-07-12 16:33:49 +03:00
Dependencies=
exitrd
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. (cherry picked from commit 68ee9771145464949d36d62a0ec687ecfb39290a)
2024-07-16 13:07:38 +03:00
initrd
mkosi: Introduce build image We want the exitrd image to be built with the latest systemd as well. As the exitrd image is built as part of mkosi.images, and all subimages are built before the main image, this implies the packages must be built as a subimage in mkosi.images/ as well. So we introduce the build image and move all logic related to building distribution packages there. This also has the nice side effect of slimming down the main image as the build dependencies are not installed into the main image anymore. It also makes sure the packages are built in a "clean" chroot without any of the other packages which we install in the main image available. (cherry picked from commit 7205fc7dc31eb2be3075ee6ba23ebe84324aa5cb)
2024-07-12 16:33:49 +03:00
minimal-base
minimal-0
minimal-1
PassEnvironment=
NO_BUILD
NO_SYNC
WIPE
SANITIZERS
CFLAGS
LDFLAGS
LLVM
MESON_VERBOSE
MESON_OPTIONS
SYSEXT
WITH_DEBUG
mkosi: Pass ASAN_OPTIONS to subimages systemd built with sanitizers is installed in subimages and tools might get invoked in postinstall scripts so we have to disable ASAN in the subimages as well during the image build. (cherry picked from commit 345a4fcbb6ed16ab19d0d5b0c7344e5cdfe29efd)
2024-10-02 12:27:09 +03:00
ASAN_OPTIONS
mkosi: Only build system preset by default Let's not build all presets by default, but only the system preset. Also, let's only make the system preset depend on the initrd preset if we're building a bootable disk image. This means that if we build the system image as a cpio, uki or directory, the initrd preset will be skipped as it's not necessary, making the build a little faster.
2023-09-09 11:20:01 +03:00
Move shared mkosi settings to a single file in mkosi.default.d/
2021-01-03 18:05:06 +03:00
[Output]
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. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
2024-07-08 13:59:52 +03:00
RepartDirectories=mkosi.repart
OutputDirectory=build/mkosi.output
BuildDirectory=build/mkosi.builddir
CacheDirectory=build/mkosi.cache
mkosi: Move settings to right sections
2023-07-14 15:52:58 +03:00
[Content]
mkosi: Add BuildSourcesEphemeral=yes Required to make sure that any changes packaging specs make to the source files are thrown away after the build so they don't mess with the source tree.
2024-03-08 21:12:16 +03:00
BuildSourcesEphemeral=yes
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. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
2024-07-08 13:59:52 +03:00
Autologin=yes
ExtraTrees=
mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
mkosi: Introduce build image We want the exitrd image to be built with the latest systemd as well. As the exitrd image is built as part of mkosi.images, and all subimages are built before the main image, this implies the packages must be built as a subimage in mkosi.images/ as well. So we introduce the build image and move all logic related to building distribution packages there. This also has the nice side effect of slimming down the main image as the build dependencies are not installed into the main image anymore. It also makes sure the packages are built in a "clean" chroot without any of the other packages which we install in the main image available. (cherry picked from commit 7205fc7dc31eb2be3075ee6ba23ebe84324aa5cb)
2024-07-12 16:33:49 +03:00
%O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw
%O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity
%O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig
%O/minimal-1.root-%a.raw:/usr/share/minimal_1.raw
%O/minimal-1.root-%a-verity.raw:/usr/share/minimal_1.verity
%O/minimal-1.root-%a-verity-sig.raw:/usr/share/minimal_1.verity.sig
%O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template
%O/exitrd:/exitrd
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. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
2024-07-08 13:59:52 +03:00
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. (cherry picked from commit 68ee9771145464949d36d62a0ec687ecfb39290a)
2024-07-16 13:07:38 +03:00
Initrds=%O/initrd
TEST-06-SELINUX: Various fixes - Stop installing the policy in the initramfs as it's not really supported anyway (https://github.com/fedora-selinux/selinux-policy/issues/2221) - Stop relabeling on first boot and prefer to do it at image build time - Disable mkosi relabeling by default but enable it in CI - Build image as root in CI so the SELinux relabeling works properly (cherry picked from commit dedd712dd9b4883678765b9bc1a8ac349cf24f3b)
2024-07-09 13:26:11 +03:00
# Disable relabeling by default as it only matters for TEST-06-SELINUX, takes a non-trivial amount of time
# and results in lots of errors when building images as a regular user.
SELinuxRelabel=no
mkosi: Add note about kernel command line limit
2024-05-31 18:26:01 +03:00
# Adding more kernel command line arguments is likely to hit the kernel command line limit (512 bytes) in
# various scenarios. Consider adding support for a credential instead if possible and using that.
mkosi: Fix formatting All of our lists start on the next line, so let's make KernelCommandLine= fit that as well. (cherry picked from commit 1250dc6a1d4fe1dbb8bcd21fc642c4ffdc60e0c7)
2024-07-18 13:47:51 +03:00
KernelCommandLine=
systemd.crash_shell
systemd.log_level=debug,console:info
systemd.log_ratelimit_kmsg=0
# Disable the kernel's ratelimiting on userspace logging to kmsg.
printk.devkmsg=on
# Make sure /sysroot is mounted rw in the initrd.
rw
# Lower the default device timeout so we get a shell earlier if the root device does
# not appear for some reason.
mkosi: Bump device timeout even more I still manage to hit it in some cases so let's bump again. (cherry picked from commit fffbfb4ed1b949a853773e0445197c2aba4e5f91)
2024-07-23 15:16:23 +03:00
systemd.default_device_timeout_sec=90
mkosi: Fix formatting All of our lists start on the next line, so let's make KernelCommandLine= fit that as well. (cherry picked from commit 1250dc6a1d4fe1dbb8bcd21fc642c4ffdc60e0c7)
2024-07-18 13:47:51 +03:00
# Make sure no LSMs are enabled by default.
selinux=0
systemd.early_core_pattern=/core
systemd.firstboot=no
raid=noautodetect
oops=panic
panic=-1
softlockup_panic=1
panic_on_warn=1
# These don't ship proper units with [Install] directives so we have to mask them instead.
systemd.mask=isc-dhcp-server.service
systemd.mask=mdmonitor.service
psi=1
mkosi: Build command line into the image This allows using systemd-vmspawn itself while still getting a decent experience.
2024-04-19 14:25:31 +03:00
mkosi: Include fewer modules in the initramfs Let's only use mkosi's default list of modules instead of all of them.
2024-06-05 19:22:22 +03:00
KernelModulesInitrdExclude=.*
KernelModulesInitrdInclude=default
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. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
2024-07-08 13:59:52 +03:00
Packages=
acl
attr
bash-completion
mkosi: Install binutils (cherry picked from commit a1071c12499c7a5d918f5a6c93d052efbcaec803)
2024-07-14 23:56:43 +03:00
binutils
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. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
2024-07-08 13:59:52 +03:00
coreutils
curl
diffutils
dnsmasq
dosfstools
e2fsprogs
findutils
gdb
grep
gzip
jq
kbd
kexec-tools
kmod
less
mkosi: Install llvm For llvm-symbolizer which is required to sanitize address sanitizer reports. (cherry picked from commit c022fcd80c5bf94e8ac5511559f085303b24b070)
2024-08-08 22:48:34 +03:00
llvm
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. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
2024-07-08 13:59:52 +03:00
lvm2
man
mdadm
mtools
nano
nftables
nvme-cli
opensc
openssl
p11-kit
pciutils
python3
radvd
rsync
sed
socat
strace
tar
tmux
tree
util-linux
valgrind
which
wireguard-tools
xfsprogs
zsh
zstd
Move shared mkosi settings to a single file in mkosi.default.d/
2021-01-03 18:05:06 +03:00
[Host]
test: Don't persist journal in mkosi image if we're not debugging tests If we're not debugging tests, there's no point in persisting the journal, so let's use the volatile journal storage mode in that case to avoid doing unnecessary work. We don't disable journal storage alltogether since various tests check that stuff is written to the journal.
2024-04-30 15:29:14 +03:00
Credentials=journal.storage=persistent
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. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
2024-07-08 13:59:52 +03:00
Incremental=yes
RuntimeBuildSources=yes
RuntimeScratch=no
QemuSmp=2
QemuSwtpm=yes
QemuVsock=yes
QemuKvm=yes
mkosi: Build a directory image by default Both building and booting a directory image is much faster than building or booting a disk image so let's default to a directory image. In CI, we stick to a disk image to make sure that keeps working as well. The only extra dependency this introduces is virtiofsd which is packaged in all distributions except Debian stable. For users hacking on systemd on Debian stable, a disk image can be built by writing the following to mkosi.local.conf: ``` [Output] Format=disk ```
2023-12-07 21:52:41 +03:00
ToolsTreePackages=virtiofsd
Copy Permalink