summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-03-29 10:42:23 +0200
committerLuca Boccassi <luca.boccassi@gmail.com>2023-03-29 11:13:33 +0100
commit0beb2a95a487cd270670fc6c23c4a25e44e8dee8 (patch)
tree67cd19623d8daa456b57c57d3d21c38678987d8c
parent139203e1d4d0a665de65c97fb1578330d5ee9dfc (diff)
downloadsystemd-0beb2a95a487cd270670fc6c23c4a25e44e8dee8.tar.gz
mkosi: Update to latest
- ACLs are not set on generated directories anymore by default, so we enable them explictly now so that when running unprivileged mkosi, the user running mkosi can remove all generated files and directories. - We don't explicitly set QemuHeadless= anymore as the option was removed and made the default. - We set the loglevel= kernel cmdline argument explicitly now as mkosi doesn't set it by default anymore.
-rw-r--r--.github/workflows/mkosi.yml2
-rw-r--r--mkosi.conf.d/10-systemd.conf4
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index a4a315bc23..90c3d07828 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -73,7 +73,7 @@ jobs:
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- - uses: systemd/mkosi@c1f1e9ab2fe89f21ebdb4984b676f9a489081a64
+ - uses: systemd/mkosi@36638fb37e0ccbb97bbaa573d158dcea3a5f9bde
- name: Configure
run: |
diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index dbc50793a7..0b364f49f2 100644
--- a/mkosi.conf.d/10-systemd.conf
+++ b/mkosi.conf.d/10-systemd.conf
@@ -65,7 +65,7 @@ BuildPackages=
zstd
[Host]
-QemuHeadless=yes
+Acl=yes
Netdev=yes
QemuMem=2G
ExtraSearchPaths=build/
@@ -74,6 +74,8 @@ KernelCommandLineExtra=systemd.crash_shell
systemd.journald.forward_to_console
systemd.journald.max_level_console=warning
systemd.mask=auditd
+ # Tell the kernel to only log warning and up to the console.
+ loglevel=4
[Validation]
Password=