shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 01:55:22 +03:00
Code

Merge pull request #33752 from DaanDeMeyer/lsm

Browse Source 
Two mkosi improvements
This commit is contained in:
Daan De Meyer 2024-07-17 20:15:17 +02:00 committed by GitHub
commit 473747b8cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkosi.conf
View File

@ -67,9 +67,7 @@ KernelCommandLine=systemd.crash_shell
# not appear for some reason. # not appear for some reason.
systemd.default_device_timeout_sec=30 systemd.default_device_timeout_sec=30
# Make sure no LSMs are enabled by default. # Make sure no LSMs are enabled by default.
apparmor=0
selinux=0 selinux=0
enforcing=0
systemd.early_core_pattern=/core systemd.early_core_pattern=/core
systemd.firstboot=no systemd.firstboot=no
raid=noautodetect raid=noautodetect

2
test/TEST-06-SELINUX/meson.build
View File

@ -3,7 +3,7 @@
integration_tests += [ integration_tests += [
integration_test_template + { integration_test_template + {
'name' : fs.name(meson.current_source_dir()), 'name' : fs.name(meson.current_source_dir()),
'cmdline' : integration_test_template['cmdline'] + ['selinux=1', 'lsm=selinux'], 'cmdline' : integration_test_template['cmdline'] + ['selinux=1', 'enforcing=0', 'lsm=selinux'],
# FIXME; Figure out why reboot sometimes hangs with 'linux' firmware. # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
# Use 'auto' to automatically fallback on non-uefi architectures. # Use 'auto' to automatically fallback on non-uefi architectures.
'firmware' : 'auto', 'firmware' : 'auto',