Merge pull request #2129 from dm0-/systemd-3826

sys-apps/systemd: revert to the previous /etc/resolv.conf
This commit is contained in:
David Michael 2016-08-12 14:50:15 -07:00 committed by GitHub
commit 2d03d070c8
2 changed files with 2 additions and 0 deletions

View File

@ -157,6 +157,8 @@ src_unpack() {
src_prepare() { src_prepare() {
# Bug 463376 # Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
# Bug https://github.com/systemd/systemd/issues/3826
sed -i -e 's,/usr/lib/systemd/resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/etc.conf.m4 || die
[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )