diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-10 21:33:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-10 21:33:23 +0200 |
commit | 14fb6354f18a4927213554af0adcff6441354505 (patch) | |
tree | ce0184fa323dc4969d56fb9a7881b9e1015b36c5 /mkosi.conf | |
parent | Merge pull request #33559 from YHNdnzj/reenable-now (diff) | |
parent | mkosi: update opensuse commit reference (diff) | |
download | systemd-14fb6354f18a4927213554af0adcff6441354505.tar.xz systemd-14fb6354f18a4927213554af0adcff6441354505.zip |
Merge pull request #33636 from DaanDeMeyer/ext4
Various integration test improvements
Diffstat (limited to 'mkosi.conf')
-rw-r--r-- | mkosi.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkosi.conf b/mkosi.conf index 907d69e0aa..b47b30c98b 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -11,7 +11,6 @@ BuildDirectory=build/mkosi.builddir CacheDirectory=build/mkosi.cache [Content] -SELinuxRelabel=no BuildSourcesEphemeral=yes Autologin=yes @@ -24,6 +23,10 @@ ExtraTrees= Environment= SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F +# 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 + # 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 |