summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-07-15 01:57:12 +0000
committerMike Gilbert <floppym@gentoo.org>2014-07-15 01:57:12 +0000
commit53c830feec4400c96513e0fdc68751cc983dd28d (patch)
tree609a24d678f261227ee1dbc5d924b1d1dd06eabf /sys-apps/systemd
parentVersion bump and update HOMEPAGE. (diff)
downloadgentoo-2-53c830feec4400c96513e0fdc68751cc983dd28d.tar.gz
gentoo-2-53c830feec4400c96513e0fdc68751cc983dd28d.tar.bz2
gentoo-2-53c830feec4400c96513e0fdc68751cc983dd28d.zip
Add a warning about systemd-resolved.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/systemd-215-r1.ebuild11
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild11
3 files changed, 23 insertions, 5 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 434cb4f47d56..67fa55c49928 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.286 2014/07/11 20:51:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.287 2014/07/15 01:57:12 floppym Exp $
+
+ 15 Jul 2014; Mike Gilbert <floppym@gentoo.org> systemd-215-r1.ebuild,
+ systemd-9999.ebuild:
+ Add a warning about systemd-resolved.
11 Jul 2014; Mike Gilbert <floppym@gentoo.org> systemd-215-r1.ebuild:
Make sure we regenerate emergency.service.
diff --git a/sys-apps/systemd/systemd-215-r1.ebuild b/sys-apps/systemd/systemd-215-r1.ebuild
index 3a70cc8c8e67..d7c75d0e68e5 100644
--- a/sys-apps/systemd/systemd-215-r1.ebuild
+++ b/sys-apps/systemd/systemd-215-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r1.ebuild,v 1.2 2014/07/11 20:51:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r1.ebuild,v 1.3 2014/07/15 01:57:12 floppym Exp $
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="acl audit cryptsetup doc elfutils +firmware-loader gcrypt gudev http
introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux
ssl test vanilla"
@@ -470,6 +470,13 @@ pkg_postinst() {
ewarn
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
+ fi
+
if ! has_version sys-apps/systemd-ui; then
elog "To get additional features, a number of optional runtime dependencies may"
elog "be installed:"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 93ba6c7c76d0..1043b37c9c0d 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.125 2014/07/10 17:12:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.126 2014/07/15 01:57:12 floppym Exp $
EAPI=5
@@ -24,7 +24,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="acl audit cryptsetup doc elfutils +firmware-loader gcrypt gudev http
introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux
ssl test vanilla"
@@ -488,6 +488,13 @@ pkg_postinst() {
ewarn
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
+ fi
+
if ! has_version sys-apps/systemd-ui; then
elog "To get additional features, a number of optional runtime dependencies may"
elog "be installed:"