diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-10 15:09:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-10 15:09:46 -0400 |
| commit | a8d38e4f1598c4b3ec5e06d65e50a3a3613b29f6 (patch) | |
| tree | a2e19e7a52f229946794f4a764102e7a52c051fe /tmpfiles.d | |
| parent | 7a1416642f6d169234d6ce4272e59c6b7e37a218 (diff) | |
I want tmpfiles m4 changes to trigger a conflict
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/etc.conf.m4 | 3 | ||||
| -rw-r--r-- | tmpfiles.d/systemd-resolved.conf | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 index ef7b9b9541..928105ea8d 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts m4_ifdef(`HAVE_SMACK_RUN_LABEL', t /etc/mtab - - - - security.SMACK64=_ )m4_dnl -m4_ifdef(`ENABLE_RESOLVED', -L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf -)m4_dnl C /etc/nsswitch.conf - - - - m4_ifdef(`HAVE_PAM', C /etc/pam.d - - - - diff --git a/tmpfiles.d/systemd-resolved.conf b/tmpfiles.d/systemd-resolved.conf new file mode 100644 index 0000000000..3160f5cf7e --- /dev/null +++ b/tmpfiles.d/systemd-resolved.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/resolv.conf |