diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-10-24 15:28:41 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2017-10-24 15:28:41 +0200 |
commit | e6b2d948f8f5aabf6cdede8bd39256fe83db205e (patch) | |
tree | c78ea99b51bcf828c4c112ca66c25185b4d44753 /tmpfiles.d | |
parent | Merge pull request #7141 from yuwata/fix-7129 (diff) | |
download | systemd-e6b2d948f8f5aabf6cdede8bd39256fe83db205e.tar.xz systemd-e6b2d948f8f5aabf6cdede8bd39256fe83db205e.zip |
resolved: create private stub resolve file for /etc/resolv.conf integration (#7014)
This creates a second private resolve.conf file which lists the stub resolver
and the resolved acquired search domains.
This runtime file should be used as a symlink target for /etc/resolv.conf such
that non-nss based applications can resolve search domains.
Fixes: #7009
Diffstat (limited to 'tmpfiles.d')
-rw-r--r-- | tmpfiles.d/etc.conf.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 index 35e3809f57..df8d42101c 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -14,7 +14,7 @@ m4_ifdef(`HAVE_SMACK_RUN_LABEL', t /etc/mtab - - - - security.SMACK64=_ )m4_dnl m4_ifdef(`ENABLE_RESOLVE', -L! /etc/resolv.conf - - - - ../usr/lib/systemd/resolv.conf +L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf )m4_dnl C /etc/nsswitch.conf - - - - m4_ifdef(`HAVE_PAM', |