Fix systemd service target. Thanks to Tom Gundersen for explaining this.

Package-Manager: portage-2.2.0_alpha49_p5/cvs/Linux x86_64

4 files changed, 28 insertions, 10 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index f3450b7c6e1c..42e1db577aa6 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.323 2011/07/29 09:01:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.324 2011/08/02 21:16:25 mgorny Exp $
+
+  02 Aug 2011; Michał Górny <mgorny@gentoo.org> dhcpcd-5.2.12-r1.ebuild,
+  files/dhcpcd.service:
+  Fix systemd service target. Thanks to Tom Gundersen for explaining this.
 
   29 Jul 2011; Zac Medico <zmedico@gentoo.org> dhcpcd-5.2.12-r1.ebuild:
   Add ~x86-linux keyword.
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index eb81be8e339b..0bea3b79f408 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255cce666c11b1082593e8ff2ef67ad6c3e0a0 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492
 AUX dhcpcd.initd-1 500 RMD160 154c421adaee89a5ad6a95479d3707d58d4949f2 SHA1 8073c2cc3a5cfe12aa214744e895a96ef633ad16 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e
-AUX dhcpcd.service 137 RMD160 dc340a963666fe3e63274a108979217d5e3fb61c SHA1 be0f97c6c26f337bffe70f0c8464a6985965d21d SHA256 8fc320592e8aa2fe29f48c8780269826004bc027a97e0b58f69af347c21b66ed
+AUX dhcpcd.service 183 RMD160 7916062e706686d147052becb491cc9c32f10e2c SHA1 bf119fa6187d6110e3d2dc1dcd273bb8ec81bdc5 SHA256 06aaf350b11b1cea6ced9e2b5c69011e1daf6eb0ac9b2a9f2c9f81a9be31f463
 DIST dhcpcd-5.2.12.tar.bz2 72177 RMD160 588a6e508b3ed7e07e044c4da77512eebc9bd607 SHA1 27378a251705c7888332e6d60eea7805d1f8aeb5 SHA256 55da7dcf64cd3dda5217d0e01748a3d980ab0cd625bae0efc00420eadd7f559b
-EBUILD dhcpcd-5.2.12-r1.ebuild 2991 RMD160 03e6baf8d389c8322b4ceabe8b87bc15c7985848 SHA1 78d06a99c6b539ccd86b954a7d384bc1ac90d1d1 SHA256 e71738be6f016e28d10c5ae5c7248fa055b17f5132e4bc77eef46c469de38a1b
+EBUILD dhcpcd-5.2.12-r1.ebuild 3382 RMD160 bd9af67386fc557c15af20be1c82e093a1599ddc SHA1 2e2c96fbc810895a563c465a7ecfae60e9538b7a SHA256 2c9f35698d3d381e950cbaf42a9e224905e6adc471cab8a386f3d02d3443737f
 EBUILD dhcpcd-5.2.12.ebuild 2863 RMD160 3a29e09878f8083bf2f83cde3870020690351b27 SHA1 aefc6a69c560f95011c918354badb9d90bbacf5d SHA256 ba7c42c6184c2dfdd2b907a974b199be13c6f7d30fed4b96fa7988615bcb651f
-MISC ChangeLog 45425 RMD160 9c919bcc6ae2e00834fb63d50ec194a9fe48de7f SHA1 2cbb7ed17da1b48ceef6fada6d8d51050acc9602 SHA256 df13645b82c332783bd1bd3b4682907e712353795ace503d0338c3f13e5b933b
+MISC ChangeLog 45599 RMD160 9b06ba2077d5a6aedcdc27e0a909968017a4c857 SHA1 d8242620635fd5346f99b7740ded7859cab13bbd SHA256 2e9787abf42914bc33eba986233e3485c3dec321ca7874e333fee2cd05eac28a
 MISC metadata.xml 267 RMD160 b367f579205ecf0dee9655865b1d475b55ae23c3 SHA1 18d814d5103674d7e4f70cf384977757cb952160 SHA256 e49d3af922c81acd77a87c5432515be3bec34c7fd6646941acae7c5ea113a08e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4ydv4ACgkQ/ejvha5XGaP+TACeMgSxEXoF+Xo/3qBEBTvpqctk
-ZVEAn0wlOGiVOSC7nYBkVV3fSVlwENiX
-=F/PZ
+iJwEAQEIAAYFAk44aYMACgkQfXuS5UK5QB3vFQP/ZTCuZFBeyHPvhrZFwjxVhsda
+p1vJSg6imUtc8NyTujtT3gOYEbBXd//mFr4KOl/iAAVTMA5VGTyOp2xOm8vDiZHV
+wFzK2BgPce9AxF6I8Dwz91UlUHyXiwdvvw937dWGsQ5vhSGymSWgNIRI74POYcHZ
+Ii0wZ3pFcRov0xo19kY=
+=kOZv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild b/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild
index 22f0d46c7cc0..49223adc26e5 100644
--- a/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild,v 1.3 2011/07/29 09:01:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild,v 1.4 2011/08/02 21:16:25 mgorny Exp $
 
 EAPI=4
 
@@ -91,4 +91,14 @@ pkg_postinst() {
 	elog "Also, users upgrading from 4.0 series should be aware that"
 	elog "the -N, -R and -Y command line options no longer exist."
 	elog "These are controled now by nohook options in dhcpcd.conf."
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]]
+	then
+		ebegin "Moving ${PN}.service to multi-user.target"
+		mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \
+			"${ROOT}"/etc/systemd/system/multi-user.target.wants/
+		eend ${?} \
+			"Please try to re-enable dhcpcd.service"
+	fi
 }
diff --git a/net-misc/dhcpcd/files/dhcpcd.service b/net-misc/dhcpcd/files/dhcpcd.service
index 46a6567e05e3..2ac9adca0692 100644
--- a/net-misc/dhcpcd/files/dhcpcd.service
+++ b/net-misc/dhcpcd/files/dhcpcd.service
@@ -1,8 +1,10 @@
 [Unit]
 Description=Lightweight DHCP client daemon
+Wants=network.target
+Before=network.target
 
 [Service]
 ExecStart=/sbin/dhcpcd -q --nobackground
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target