diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-08-02 21:19:28 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-08-02 21:19:28 +0000 |
| commit | eccfdd46d6790435e42d0e472b5e2c75257dcd9b (patch) | |
| tree | b24605542ae8c3825618dcf06f0ed576a2247a47 /net-wireless/wpa_supplicant | |
| parent | Fix systemd service target. Thanks to Tom Gundersen for explaining this. (diff) | |
| download | gentoo-2-eccfdd46d6790435e42d0e472b5e2c75257dcd9b.tar.gz gentoo-2-eccfdd46d6790435e42d0e472b5e2c75257dcd9b.tar.bz2 gentoo-2-eccfdd46d6790435e42d0e472b5e2c75257dcd9b.zip | |
Fix systemd service target. Thanks to Tom Gundersen for explaining this.
(Portage version: 2.2.0_alpha49_p5/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/wpa_supplicant')
4 files changed, 23 insertions, 5 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index c7a2a43164c3..7ea9ed3156c6 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.163 2011/07/24 11:10:19 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.164 2011/08/02 21:19:28 mgorny Exp $ + + 02 Aug 2011; Michał Górny <mgorny@gentoo.org> + wpa_supplicant-0.7.3-r5.ebuild, files/wpa_supplicant.service, + files/wpa_supplicant_at.service: + Fix systemd service target. Thanks to Tom Gundersen for explaining this. 24 Jul 2011; <gurligebis@gentoo.org> wpa_supplicant-0.7.3-r2.ebuild, wpa_supplicant-0.7.3-r5.ebuild: diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant.service b/net-wireless/wpa_supplicant/files/wpa_supplicant.service index 4cdf16a4632e..e1e75b129528 100644 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant.service +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant.service @@ -7,5 +7,5 @@ BusName=fi.epitest.hostap.WPASupplicant ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant.conf -u [Install] -WantedBy=network.target +WantedBy=multi-user.target Alias=dbus-fi.epitest.hostap.WPASupplicant.service diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant_at.service b/net-wireless/wpa_supplicant/files/wpa_supplicant_at.service index c4ba4d62f3b6..af0cebfd691d 100644 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant_at.service +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant_at.service @@ -8,4 +8,4 @@ Type=simple ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant.conf -i%I [Install] -Alias=network.target.wants/wpa_supplicant@wlan0.service +Alias=multi-user.target.wants/wpa_supplicant@wlan0.service diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild index f7c7aa074a45..49574a8301f7 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.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-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild,v 1.3 2011/07/24 11:10:19 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild,v 1.4 2011/08/02 21:19:28 mgorny Exp $ EAPI="2" @@ -252,7 +252,7 @@ src_install() { keepdir /var/run/wpa_supplicant fi - # SystemD stuff + # systemd stuff systemd_dounit "${FILESDIR}"/wpa_supplicant.service systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service' || die } @@ -277,4 +277,17 @@ pkg_postinst() { einfo "madwifi-old, madwifi-ng or madwifi-ng-tools." einfo "You should re-emerge ${PN} after upgrading these packages." fi + + # Mea culpa, feel free to remove that after some time --mgorny. + local fn + for fn in wpa_supplicant{,@wlan0}.service; do + if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]] + then + ebegin "Moving ${fn} to multi-user.target" + mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \ + "${ROOT}"/etc/systemd/system/multi-user.target.wants/ + eend ${?} \ + "Please try to re-enable ${fn}" + fi + done } |