From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 30 Jul 2016 14:48:01 +0000 (-0400)
Subject: sys-apps/systemd: update resolv.conf warning
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6c6cd74d053dcbe1d7e6a8217c7674e07f4c74ca;p=gentoo.git

sys-apps/systemd: update resolv.conf warning

Package-Manager: portage-2.3.0_p16
---

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a470187a1ce7..b0e8183ab0a4 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -480,11 +480,9 @@ pkg_postinst() {
 		eerror
 	fi
 
-	if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then
-		ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable"
-		ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf"
-		ewarn "to /run/systemd/resolve/resolv.conf"
-		ewarn
+	if [[ $(readlink "${ROOT}"etc/resolv.conf) == */run/systemd/* ]]; then
+		ewarn "You should replace the resolv.conf symlink:"
+		ewarn "ln -snf ${ROOTPREFIX}/lib/systemd ${ROOT}etc/resolv.conf"
 	fi
 }