From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 16 Apr 2018 19:40:26 +0000 (+0200)
Subject: meson: install nspawn tmpfiles snippet only when machined is turned on
X-Git-Tag: v239~398^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8741%2Fhead;p=thirdparty%2Fsystemd.git

meson: install nspawn tmpfiles snippet only when machined is turned on
---

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 9768f3a94e6..a7a7d0a1d7a 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -7,7 +7,7 @@ enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1
 tmpfiles = [['home.conf',            ''],
             ['journal-nocow.conf',   ''],
             ['systemd-nologin.conf', ''],
-            ['systemd-nspawn.conf',  ''],
+            ['systemd-nspawn.conf',  'ENABLE_MACHINED'],
             ['tmp.conf',             ''],
             ['x11.conf',             ''],
             ['legacy.conf',          'HAVE_SYSV_COMPAT'],