shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

build: *really* install tmpfiles.d/systemd-remote.conf when necessary (#6061)

Browse Source 
This fixes commit 5e354b2252 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 a083537e5d).
This commit is contained in:
Franck Bui 2017-05-31 15:44:08 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 5e354b2252
commit f47183183c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.am
View File

@ -2676,7 +2676,6 @@ nodist_systemunit_DATA += \
nodist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-remote.conf \
tmpfiles.d/var.conf \
tmpfiles.d/etc.conf
@ -2693,6 +2692,11 @@ dist_tmpfiles_DATA += \
tmpfiles.d/legacy.conf
endif
if HAVE_REMOTE
nodist_tmpfiles_DATA += \
tmpfiles.d/systemd-remote.conf
endif
SYSINIT_TARGET_WANTS += \
systemd-tmpfiles-setup-dev.service \
systemd-tmpfiles-setup.service
@ -4361,13 +4365,6 @@ EXTRA_DIST += \
src/journal-remote/log-generator.py
endif
if HAVE_REMOTE
if ENABLE_TMPFILES
dist_tmpfiles_DATA += \
tmpfiles.d/systemd-remote.conf
endif
endif
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
journalctl_CFLAGS = \
$(AM_CFLAGS)

2
tmpfiles.d/.gitignore vendored
View File

@ -1,2 +1,4 @@
/etc.conf
/systemd.conf
/systemd-remote.conf
/var.conf