Skip to content

Commit

Permalink
tmpfiles: split out config for systemd-resolve
Browse files Browse the repository at this point in the history
This mirrors what was done in 564761f
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.
keszybz committed Nov 16, 2021
1 parent 67d0c67 commit b15f6ea
Showing 3 changed files with 11 additions and 3 deletions.
3 changes: 0 additions & 3 deletions tmpfiles.d/etc.conf.in
Original file line number Diff line number Diff line change
@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
{% if HAVE_SMACK_RUN_LABEL %}
t /etc/mtab - - - - security.SMACK64=_
{% endif %}
{% if ENABLE_RESOLVE %}
L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
{% endif %}
C! /etc/nsswitch.conf - - - -
{% if HAVE_PAM %}
C! /etc/pam.d - - - -
1 change: 1 addition & 0 deletions tmpfiles.d/meson.build
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ files = [['README', ''],
['journal-nocow.conf', ''],
['systemd-nologin.conf', 'HAVE_PAM'],
['systemd-nspawn.conf', 'ENABLE_MACHINED'],
['systemd-resolve.conf', 'ENABLE_RESOLVE'],
['systemd-tmp.conf', ''],
['portables.conf', 'ENABLE_PORTABLED'],
['systemd-pstore.conf', 'ENABLE_PSTORE'],
10 changes: 10 additions & 0 deletions tmpfiles.d/systemd-resolve.conf
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b15f6ea

Please sign in to comment.