aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2017-05-31 15:44:08 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-05-31 09:44:08 -0400
commitf47183183cffb203c00cb630564d4fc525dfcf57 (patch)
tree5d9aff6600985171c094cb81cf0b4686e9701cea /tmpfiles.d
parentbuild: only install tmpfiles.d/systemd-remote.conf when necessary (#6051) (diff)
downloadsystemd-f47183183cffb203c00cb630564d4fc525dfcf57.tar.gz
systemd-f47183183cffb203c00cb630564d4fc525dfcf57.tar.bz2
systemd-f47183183cffb203c00cb630564d4fc525dfcf57.zip
build: *really* install tmpfiles.d/systemd-remote.conf when necessary (#6061)
This fixes commit 5e354b22520bbb02e which was an attempt to avoid installation of tmpfiles.d/systemd-remote.conf when it was not needed (ie HAVE_REMOTE=false). Before this fix and with the autotool build, systemd-remote.conf was distributed and also installed (although it was empty) even though HAVE_REMOTE=false. That's what happens when doing last second changes without retesting... While at it, update tmpfiles.d/.gitignore (var.conf was missing as well since commit a083537e5d11b).
Diffstat (limited to 'tmpfiles.d')
-rw-r--r--tmpfiles.d/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore
index 4f0ecaa9c..73c62c104 100644
--- a/tmpfiles.d/.gitignore
+++ b/tmpfiles.d/.gitignore
@@ -1,2 +1,4 @@
/etc.conf
/systemd.conf
+/systemd-remote.conf
+/var.conf