diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-13 21:17:38 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-13 21:17:38 -0400 |
| commit | c73c7c774cbd1f0e778254d51da819490a333ab4 (patch) | |
| tree | 2db5fa808791e0b4fc671537690264caee56e6da /tmpfiles.d/systemd-resolved.conf | |
| parent | 5496aef5f410ca665c76fb1bbfb584c7925fd49e (diff) | |
| parent | b3ec0a0674f4e499bcb6d2469acdf9d2d574c3d6 (diff) | |
Merge branch 'systemd/parabola' into notsystemd/premove
# Conflicts:
# Makefile.am
# tmpfiles.d/etc.conf.m4
Diffstat (limited to 'tmpfiles.d/systemd-resolved.conf')
| -rw-r--r-- | tmpfiles.d/systemd-resolved.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmpfiles.d/systemd-resolved.conf b/tmpfiles.d/systemd-resolved.conf index 3160f5cf7e..760fe11412 100644 --- a/tmpfiles.d/systemd-resolved.conf +++ b/tmpfiles.d/systemd-resolved.conf @@ -7,4 +7,4 @@ # See tmpfiles.d(5) for details -L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf +L! /etc/resolv.conf - - - - ../usr/lib/systemd/resolv.conf |