diff options
| author | Franck Bui <fbui@suse.com> | 2017-05-30 17:03:25 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-05-30 19:27:26 +0200 |
| commit | 5e354b22520bbb02e5079672a6f97fe05f185d63 (patch) | |
| tree | 4d735e5cee8c827bce69931e53cae99daa6ed5a5 /tmpfiles.d | |
| parent | kernel-install: support the case /etc/machine-id is missing or empty (#5975) (diff) | |
| download | systemd-5e354b22520bbb02e5079672a6f97fe05f185d63.tar.xz systemd-5e354b22520bbb02e5079672a6f97fe05f185d63.zip | |
build: only install tmpfiles.d/systemd-remote.conf when necessary (#6051)
Also only include the relevant parts for systemd-journal-remote and
systemd-journal-upload when needed.
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/meson.build | 34 | ||||
| -rw-r--r-- | tmpfiles.d/systemd-remote.conf.m4 (renamed from tmpfiles.d/systemd-remote.conf) | 4 |
2 files changed, 25 insertions, 13 deletions
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index da87ea5056..7a48389be4 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -4,7 +4,6 @@ tmpfiles = [['home.conf', ''], ['journal-nocow.conf', ''], ['systemd-nologin.conf', ''], ['systemd-nspawn.conf', ''], - ['systemd-remote.conf', 'ENABLE_REMOTE'], ['tmp.conf', ''], ['x11.conf', ''], ['legacy.conf', 'HAVE_SYSV_COMPAT'], @@ -21,19 +20,28 @@ foreach pair : tmpfiles endif endforeach -m4_files = ['etc.conf', - 'systemd.conf', - 'var.conf'] +m4_files = [['etc.conf', ''], + ['systemd.conf', ''], + ['systemd-remote.conf', 'ENABLE_REMOTE'], + ['var.conf', ''], + ] -foreach file : m4_files - custom_target( - 'tmpfiles.d/' + file, - input : file + '.m4', - output: file, - command : [m4, '-P'] + m4_defines + ['@INPUT@'], - capture : true, - install : enable_tmpfiles, - install_dir : tmpfilesdir) +foreach pair : m4_files + if not enable_tmpfiles + # do nothing + elif pair[1] == '' or conf.get(pair[1], false) + custom_target( + 'tmpfiles.d/' + pair[0], + input : pair[0] + '.m4', + output: pair[0], + command : [m4, '-P'] + m4_defines + ['@INPUT@'], + capture : true, + install : true, + install_dir : tmpfilesdir) + else + message('Not installing tmpfiles.d/@0@.m4 because @1@ is @2@' + .format(pair[0], pair[1], conf.get(pair[1], 0))) + endif endforeach if enable_tmpfiles diff --git a/tmpfiles.d/systemd-remote.conf b/tmpfiles.d/systemd-remote.conf.m4 index e19230f648..7a0f698c11 100644 --- a/tmpfiles.d/systemd-remote.conf +++ b/tmpfiles.d/systemd-remote.conf.m4 @@ -6,8 +6,12 @@ # (at your option) any later version. # See tmpfiles.d(5) for details +m4_ifdef(`HAVE_LIBCURL', d /var/lib/systemd/journal-upload 0755 systemd-journal-upload systemd-journal-upload - - +)m4_dnl +m4_ifdef(`HAVE_MICROHTTPD', z /var/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - - z /run/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - - +)m4_dnl |