diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-08-27 17:45:41 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-08-27 18:17:16 +0200 |
| commit | aeb50ff0bd4bbbca74c4695072232348351d512d (patch) | |
| tree | da9ccc62028fcaac678bb614561cf0471c92f36c /tmpfiles.d | |
| parent | 81fc054dc7c365545bca86d78bf36a12658cedb3 (diff) | |
tmpfiles: make resolv.conf entry conditional on resolved support
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/.gitignore | 1 | ||||
| -rw-r--r-- | tmpfiles.d/etc.conf.m4 (renamed from tmpfiles.d/etc.conf) | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore new file mode 100644 index 0000000000..eb323154ff --- /dev/null +++ b/tmpfiles.d/.gitignore @@ -0,0 +1 @@ +etc.conf diff --git a/tmpfiles.d/etc.conf b/tmpfiles.d/etc.conf.m4 index b23272cb27..f567c8d6ea 100644 --- a/tmpfiles.d/etc.conf +++ b/tmpfiles.d/etc.conf.m4 @@ -10,6 +10,8 @@ L /etc/os-release - - - - ../usr/lib/os-release L /etc/localtime - - - - ../usr/share/zoneinfo/UTC L+ /etc/mtab - - - - ../proc/self/mounts +m4_ifdef(`ENABLE_RESOLVED', L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf +) C /etc/nsswitch.conf - - - - C /etc/pam.d - - - - |