From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 16 May 2021 18:13:14 +0000 (+0200)
Subject: units: generate ReadWritePaths= in the template
X-Git-Tag: v249-rc1~210^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71ae5ce544f5ec8ec9856d930cbca6b3a5a7a3bf;p=thirdparty%2Fsystemd.git

units: generate ReadWritePaths= in the template
---

diff --git a/meson.build b/meson.build
index 171c3dda737..8b1871523f1 100644
--- a/meson.build
+++ b/meson.build
@@ -828,15 +828,10 @@ endif
 conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale)
 
 localegen_path = get_option('localegen-path')
-have = false
-writable = ''
 if localegen_path != ''
         conf.set_quoted('LOCALEGEN_PATH', localegen_path)
-        have = true
-        writable = ' /usr/lib/locale'
 endif
-conf.set_quoted('SERVICE_LOCALEGEN_WRITABLE', writable)
-conf.set10('HAVE_LOCALEGEN', have)
+conf.set10('HAVE_LOCALEGEN', localegen_path != '')
 
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
index abd32266aeb..f9a92fef7be 100644
--- a/units/systemd-localed.service.in
+++ b/units/systemd-localed.service.in
@@ -33,7 +33,10 @@ ProtectKernelLogs=yes
 ProtectKernelModules=yes
 ProtectKernelTunables=yes
 ProtectSystem=strict
-ReadWritePaths=/etc{{SERVICE_LOCALEGEN_WRITABLE}}
+ReadWritePaths=/etc
+{% if HAVE_LOCALEGEN %}
+ReadWritePaths=/usr/lib/locale
+{% endif %}
 RestrictAddressFamilies=AF_UNIX
 RestrictNamespaces=yes
 RestrictRealtime=yes