[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     6c6cd74d053dcbe1d7e6a8217c7674e07f4c74ca
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 14:48:01 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 15:46:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6cd74d

sys-apps/systemd: update resolv.conf warning

Package-Manager: portage-2.3.0_p16

 sys-apps/systemd/systemd-9999.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index a470187..b0e8183 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
 }