shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00
Code

tmpfiles: make resolv.conf entry conditional on resolved support

Browse Source
This commit is contained in:
Tom Gundersen 2014-08-27 17:45:41 +02:00
parent 81fc054dc7
commit aeb50ff0bd
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@ -1940,14 +1940,16 @@ nodist_systemunit_DATA += \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service
nodist_tmpfiles_DATA = \
tmpfiles.d/etc.conf
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
tmpfiles.d/systemd-remote.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
tmpfiles.d/var.conf \
tmpfiles.d/etc.conf
tmpfiles.d/var.conf
if HAVE_SYSV_COMPAT
dist_tmpfiles_DATA += \
@ -1970,10 +1972,14 @@ INSTALL_DIRS += \
endif
EXTRA_DIST += \
tmpfiles.d/etc.conf.m4 \
units/systemd-tmpfiles-setup-dev.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in
CLEANFILES += \
tmpfiles.d/etc.conf
# ------------------------------------------------------------------------------
if ENABLE_SYSUSERS
systemd_sysusers_SOURCES = \
@ -5708,6 +5714,11 @@ src/%: src/%.m4
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
tmpfiles.d/%: tmpfiles.d/%.m4
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
units/%: units/%.m4
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@

2
TODO
View File

@ -120,8 +120,6 @@ Features:
* Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
* the resolv.conf tmpfiles line should be covered by ENABLE_NETWORKD...
* Add a new verb "systemctl top"
* logind: allow users to kill or lock their own sessions

1
configure.ac
View File

@ -1023,6 +1023,7 @@ have_resolved=no
AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon]))
if test "x$enable_resolved" != "xno"; then
have_resolved=yes
M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
fi
AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"])

1
tmpfiles.d/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
etc.conf

2
tmpfiles.d/etc.conf → tmpfiles.d/etc.conf.m4
View File

@ -10,6 +10,8 @@
L /etc/os-release - - - - ../usr/lib/os-release
L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
L+ /etc/mtab - - - - ../proc/self/mounts
m4_ifdef(`ENABLE_RESOLVED',
L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
)
C /etc/nsswitch.conf - - - -
C /etc/pam.d - - - -