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

tmpfiles: split out config for systemd-resolve

Browse Source 
This mirrors what was done in 564761fcae
for sysusers.d. If we allow separating resolved sysusers config
in a subpackage, we should do the same for the symlink that is
only useful when resolved is installed.

Related to #21317.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-11-16 12:52:21 +01:00
parent 67d0c6744f
commit b15f6eae42
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tmpfiles.d/etc.conf.in
View File

@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
{% if HAVE_SMACK_RUN_LABEL %} {% if HAVE_SMACK_RUN_LABEL %}
t /etc/mtab - - - - security.SMACK64=_ t /etc/mtab - - - - security.SMACK64=_
{% endif %} {% endif %}
{% if ENABLE_RESOLVE %}
L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
{% endif %}
C! /etc/nsswitch.conf - - - - C! /etc/nsswitch.conf - - - -
{% if HAVE_PAM %} {% if HAVE_PAM %}
C! /etc/pam.d - - - - C! /etc/pam.d - - - -

1
tmpfiles.d/meson.build
View File

@ -7,6 +7,7 @@ files = [['README', ''],
['journal-nocow.conf', ''], ['journal-nocow.conf', ''],
['systemd-nologin.conf', 'HAVE_PAM'], ['systemd-nologin.conf', 'HAVE_PAM'],
['systemd-nspawn.conf', 'ENABLE_MACHINED'], ['systemd-nspawn.conf', 'ENABLE_MACHINED'],
['systemd-resolve.conf', 'ENABLE_RESOLVE'],
['systemd-tmp.conf', ''], ['systemd-tmp.conf', ''],
['portables.conf', 'ENABLE_PORTABLED'], ['portables.conf', 'ENABLE_PORTABLED'],
['systemd-pstore.conf', 'ENABLE_PSTORE'], ['systemd-pstore.conf', 'ENABLE_PSTORE'],

10
tmpfiles.d/systemd-resolve.conf Normal file
View File

@ -0,0 +1,10 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
# See tmpfiles.d(5) for details
L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf