diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 13:35:51 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:24:43 +0900 |
| commit | d924a938fe3dbba360cdbee0201ea9797c5f8bff (patch) | |
| tree | f4a982db4a863fe9e017916df5228f2005b6a89c /meson.build | |
| parent | 645b2b190c1f3d8fcbc17597c1cbd256fad535ec (diff) | |
| download | systemd-d924a938fe3dbba360cdbee0201ea9797c5f8bff.tar.gz | |
meson: use jinja2 for tmpfiles.d templates
HAVE_SMACK_RUN_LABEL was dropped back in 348b44372f36010d48d9a7dda14ef67155753a71,
so one line in etc.conf was not rendered as expected ;(
Checking if names are defined is paying for itself!
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 44931368de..c98c4c1e7d 100644 --- a/meson.build +++ b/meson.build @@ -850,6 +850,7 @@ conf.set10('ENABLE_ADM_GROUP', get_option('adm-group')) conf.set10('ENABLE_WHEEL_GROUP', get_option('wheel-group')) dev_kvm_mode = get_option('dev-kvm-mode') +conf.set_quoted('DEV_KVM_MODE', dev_kvm_mode) # FIXME: convert to 0o… notation substs.set('DEV_KVM_MODE', dev_kvm_mode) conf.set10('DEV_KVM_UACCESS', dev_kvm_mode != '0666') group_render_mode = get_option('group-render-mode') @@ -1040,10 +1041,8 @@ else endif conf.set10('HAVE_APPARMOR', have) -smack_run_label = get_option('smack-run-label') -if smack_run_label != '' - conf.set_quoted('SMACK_RUN_LABEL', smack_run_label) -endif +conf.set10('HAVE_SMACK_RUN_LABEL', get_option('smack-run-label') != '') +conf.set_quoted('SMACK_RUN_LABEL', get_option('smack-run-label')) want_polkit = get_option('polkit') install_polkit = false |