shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Code

units: generate ReadWritePaths= in the template

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-05-16 20:13:14 +02:00 committed by Yu Watanabe
parent 491bf10c80
commit 71ae5ce544
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -828,15 +828,10 @@ endif
conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale) conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale)
localegen_path = get_option('localegen-path') localegen_path = get_option('localegen-path')
have = false
writable = ''
if localegen_path != '' if localegen_path != ''
conf.set_quoted('LOCALEGEN_PATH', localegen_path) conf.set_quoted('LOCALEGEN_PATH', localegen_path)
have = true
writable = ' /usr/lib/locale'
endif endif
conf.set_quoted('SERVICE_LOCALEGEN_WRITABLE', writable) conf.set10('HAVE_LOCALEGEN', localegen_path != '')
conf.set10('HAVE_LOCALEGEN', have)
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())

5
units/systemd-localed.service.in
View File

@ -33,7 +33,10 @@ ProtectKernelLogs=yes
ProtectKernelModules=yes ProtectKernelModules=yes
ProtectKernelTunables=yes ProtectKernelTunables=yes
ProtectSystem=strict ProtectSystem=strict
ReadWritePaths=/etc{{SERVICE_LOCALEGEN_WRITABLE}} ReadWritePaths=/etc
{% if HAVE_LOCALEGEN %}
ReadWritePaths=/usr/lib/locale
{% endif %}
RestrictAddressFamilies=AF_UNIX RestrictAddressFamilies=AF_UNIX
RestrictNamespaces=yes RestrictNamespaces=yes
RestrictRealtime=yes RestrictRealtime=yes