From a5333f14b50ab3f0a743f927f152edc36da1d403 Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Mon, 17 Jun 2024 12:06:29 +0200 Subject: [PATCH] nm-in-container: create conf.d file instead of modifying journald.conf Currently, the Dockerfile expects /etc/systemd/journald.conf to exist on the base container, but sometimes this may not be the case, for example on Fedora 40, which causes the build process to fail if the host machine is also running Fedora 40. Update the dockerfile to create a conf.d file instead, which has higher precedence. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1972 --- tools/nm-in-container | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/nm-in-container b/tools/nm-in-container index 7ff073d013..c6884cd584 100755 --- a/tools/nm-in-container +++ b/tools/nm-in-container @@ -359,7 +359,8 @@ RUN chmod 700 /var/lib/NetworkManager RUN echo -n "nm-in-container-secret-key" > /var/lib/NetworkManager/secret_key RUN chmod 600 /var/lib/NetworkManager/secret_key -RUN sed 's/.*RateLimitBurst=.*/RateLimitBurst=0/' /etc/systemd/journald.conf -i +RUN mkdir -p /etc/systemd/journald.conf.d/ && \ + echo "RateLimitBurst=0" > /etc/systemd/journald.conf.d/no-rate-limit.conf $RUN_LN_BASEDIR_NM $RUN_LN_SYMLINK_CMDS