diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 16:01:24 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 03:24:43 +0200 |
| commit | 2ad498fec02059d7c8a74a9b223165e68ca0b3e3 (patch) | |
| tree | bd798817f8da7611db5e4956aeecd873b461882b /sysctl.d | |
| parent | meson: use conf configuration_data object to generate test-sysusers.sh (diff) | |
| download | systemd-2ad498fec02059d7c8a74a9b223165e68ca0b3e3.tar.xz systemd-2ad498fec02059d7c8a74a9b223165e68ca0b3e3.zip | |
meson: use jinja2 in sysctl.d/
Diffstat (limited to 'sysctl.d')
| -rw-r--r-- | sysctl.d/50-coredump.conf.in | 2 | ||||
| -rw-r--r-- | sysctl.d/meson.build | 22 |
2 files changed, 9 insertions, 15 deletions
diff --git a/sysctl.d/50-coredump.conf.in b/sysctl.d/50-coredump.conf.in index 2ffc1cb0fb..5fb551a8cf 100644 --- a/sysctl.d/50-coredump.conf.in +++ b/sysctl.d/50-coredump.conf.in @@ -13,7 +13,7 @@ # the core dump. # # See systemd-coredump(8) and core(5). -kernel.core_pattern=|@rootlibexecdir@/systemd-coredump %P %u %g %s %t %c %h +kernel.core_pattern=|{{ROOTLIBEXECDIR}}/systemd-coredump %P %u %g %s %t %c %h # Allow 16 coredumps to be dispatched in parallel by the kernel. # We collect metadata from /proc/%P/, and thus need to make sure the crashed diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build index 7e3482af62..6f3db59554 100644 --- a/sysctl.d/meson.build +++ b/sysctl.d/meson.build @@ -5,8 +5,6 @@ install_data( '50-default.conf', install_dir : sysctldir) -in_files = [] - # Kernel determines PID_MAX_LIMIT by # #define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : \ # (sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT)) @@ -14,18 +12,14 @@ if cc.sizeof('long') > 4 install_data('50-pid-max.conf', install_dir : sysctldir) endif -if conf.get('ENABLE_COREDUMP') == 1 - in_files += ['50-coredump.conf'] -endif - -foreach file : in_files - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - install_data(gen, - install_dir : sysctldir) -endforeach +custom_target( + '50-coredump.conf', + input : '50-coredump.conf.in', + output : '50-coredump.conf', + command : [meson_render_jinja2, config_h, '@INPUT@'], + capture : true, + install : conf.get('ENABLE_COREDUMP') == 1, + install_dir : sysctldir) if install_sysconfdir meson.add_install_script('sh', '-c', |