diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 11:55:36 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:24:43 +0900 |
| commit | 6b1aac3ccf3a554011a1a6030672fa5b5c4b4f77 (patch) | |
| tree | d35120a1c59911b103e5a07b21469fae7c76fe53 /sysusers.d/basic.conf.in | |
| parent | e0698c66f4569c91e3fdd54ca77449698ae38704 (diff) | |
| download | systemd-6b1aac3ccf3a554011a1a6030672fa5b5c4b4f77.tar.gz | |
meson: replace some m4 templates with jinja2
m4 was nice in '85, but the syntax feels a bit dated. Since we use python for
meson, let's use a popular python templating engine to replace some m4 usage.
A little nicety is that typos are caught:
FAILED: sysusers.d/systemd-remote.conf
/usr/bin/meson --internal exe --capture sysusers.d/systemd-remote.conf -- /home/zbyszek/src/systemd/tools/meson-render-jinja2.py config.h ../sysusers.d/systemd-remote.conf.j2
Traceback (most recent call last):
File "/home/zbyszek/src/systemd/tools/meson-render-jinja2.py", line 28, in <module>
print(render(sys.argv[2], defines))
File "/home/zbyszek/src/systemd/tools/meson-render-jinja2.py", line 24, in render
return template.render(defines)
File "/usr/lib/python3.9/site-packages/jinja2/environment.py", line 1090, in render
self.environment.handle_exception()
File "/usr/lib/python3.9/site-packages/jinja2/environment.py", line 832, in handle_exception
reraise(*rewrite_traceback_stack(source=source))
File "/usr/lib/python3.9/site-packages/jinja2/_compat.py", line 28, in reraise
raise value.with_traceback(tb)
File "<template>", line 8, in top-level template code
jinja2.exceptions.UndefinedError: 'HAVE_MICROHTTP' is undefined
This checking mirrors what 349cc4a507c4d84fcadf61f42159ea6412717896 did for C defines.
Diffstat (limited to 'sysusers.d/basic.conf.in')
| -rw-r--r-- | sysusers.d/basic.conf.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in index 4be0bd869e..9da0251421 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in @@ -9,7 +9,7 @@ u root 0 "Super User" /root # The nobody user for NFS file systems -u @NOBODY_USER_NAME@ 65534 "Nobody" - +u {{NOBODY_USER_NAME}} 65534 "Nobody" - # Administrator group: can *see* more than normal users g adm - - - @@ -19,7 +19,7 @@ g wheel - - - # Access to certain kernel and userspace facilities g kmem - - - -g tty @TTY_GID@ - - +g tty {{TTY_GID}} - - g utmp - - - # Hardware access groups @@ -36,4 +36,4 @@ g tape - - - g video - - - # Default group for normal users -g users @USERS_GID@ - - +g users {{USERS_GID}} - - |