diff options
| -rw-r--r-- | tmpfiles.d/etc.conf.in | 3 | ||||
| -rw-r--r-- | tmpfiles.d/meson.build | 1 | ||||
| -rw-r--r-- | tmpfiles.d/systemd-resolve.conf | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in index 2323fd8cd8..ebdc699c26 100644 --- a/tmpfiles.d/etc.conf.in +++ b/tmpfiles.d/etc.conf.in @@ -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 - - - - diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index 6ae9e3e0b8..b8d3919025 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -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'], diff --git a/tmpfiles.d/systemd-resolve.conf b/tmpfiles.d/systemd-resolve.conf new file mode 100644 index 0000000000..cb1c56d6a6 --- /dev/null +++ b/tmpfiles.d/systemd-resolve.conf @@ -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 |