diff options
| -rw-r--r-- | net-misc/dhcpcd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild | 12 | ||||
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd.service | 4 |
3 files changed, 19 insertions, 3 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/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 |