shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-06 00:58:29 +03:00
Code

Merge pull request #33763 from DaanDeMeyer/mkosi

Browse Source 
mkosi: Two fixlets
This commit is contained in:
Daan De Meyer 2024-07-18 16:43:15 +02:00 committed by GitHub
commit 4698411ff3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mkosi.conf
View File

@ -56,29 +56,30 @@ SELinuxRelabel=no
# 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.
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.
systemd.default_device_timeout_sec=30
# 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
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.
systemd.default_device_timeout_sec=30
# 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
KernelModulesInitrdExclude=.*
KernelModulesInitrdInclude=default
@ -124,7 +125,6 @@ Packages=
tar
tmux
tree
udev
util-linux
valgrind
which

1
mkosi.conf.d/10-centos-fedora/mkosi.conf
View File

@ -56,6 +56,5 @@ Packages=
squashfs-tools
stress-ng
tpm2-tools
util-linux
veritysetup
vim-common

13
mkosi.conf.d/10-centos/mkosi.conf
View File

@ -8,13 +8,12 @@ Release=10
[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"
# 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"
Packages=
kernel-modules # For squashfs

4
mkosi.images/initrd/mkosi.conf
View File

@ -7,8 +7,8 @@ Include=
[Content]
ExtraTrees=
%D/mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
%D/mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
%D/mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
%D/mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
Packages=
findutils