mkosi: Remove enforcing=0 from default kernel command line

We already have selinux=0 in the default kernel command line so
enforcing=0 is redundant. Instead, pass in enforcing=0 when we
enable selinux in TEST-06-SELINUX.

diff --git a/mkosi.conf b/mkosi.conf
index b1ac8950af60cfc350d393493ece52fe2a043a98..56a89e8c228b56cfdcc7c56cc3861191d00f20d2 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -68,7 +68,6 @@ KernelCommandLine=systemd.crash_shell
                   systemd.default_device_timeout_sec=30
                   # Make sure no LSMs are enabled by default.
                   selinux=0
-                  enforcing=0
                   systemd.early_core_pattern=/core
                   systemd.firstboot=no
                   raid=noautodetect

diff --git a/test/TEST-06-SELINUX/meson.build b/test/TEST-06-SELINUX/meson.build
index ea1a381471b164410c3c3047b4616f993e5b88eb..fd670ae40da3e2eff136ad8e0119af245bc3dd52 100644 (file)
--- a/test/TEST-06-SELINUX/meson.build
+++ b/test/TEST-06-SELINUX/meson.build
@@ -3,7 +3,7 @@
 integration_tests += [
         integration_test_template + {
                 '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.
                 # Use 'auto' to automatically fallback on non-uefi architectures.
                 'firmware' : 'auto',