diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 20:13:14 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:25:26 +0900 |
| commit | 71ae5ce544f5ec8ec9856d930cbca6b3a5a7a3bf (patch) | |
| tree | 8d5308dd0e1854df9a9ad5e6ad9a008341382cf9 | |
| parent | 491bf10c808b7e8cac1f23635848ae046a838b00 (diff) | |
| download | systemd-71ae5ce544f5ec8ec9856d930cbca6b3a5a7a3bf.tar.gz | |
units: generate ReadWritePaths= in the template
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | units/systemd-localed.service.in | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meson.build b/meson.build index 171c3dda73..8b1871523f 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 abd32266ae..f9a92fef7b 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 |