From: Michał Górny Date: Tue, 2 Aug 2011 21:19:28 +0000 (+0000) Subject: Fix systemd service target. Thanks to Tom Gundersen for explaining this. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=43fc58457accc596613cb7902ba233266feef302;p=gentoo.git Fix systemd service target. Thanks to Tom Gundersen for explaining this. Package-Manager: portage-2.2.0_alpha49_p5/cvs/Linux x86_64 --- 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 + 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; wpa_supplicant-0.7.3-r2.ebuild, wpa_supplicant-0.7.3-r5.ebuild: diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index fa3052404f1d..5916f33c70bb 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX do-not-call-dbus-functions-with-NULL-path.patch 1931 RMD160 9ba6cc14cb6816062ba208f136785d664e58d347 SHA1 9ae40351bd125d5be0a392bff5239b6f3ce85af4 SHA256 faa5d9bbc79ff719c61ed24bc173ad07699a0b21f9fc472f09157d001299395e AUX wpa_cli.sh 1407 RMD160 9a5cb32f13ba933151c2978d5660e6da3c86329b SHA1 ac99d33e5c6deaf7cfa73010a6b1734d0700a91c SHA256 a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179 @@ -10,17 +10,19 @@ AUX wpa_supplicant-0.7.3-generate-libeap-peer.patch 11149 RMD160 7598acdba1e561f AUX wpa_supplicant-conf.d 161 RMD160 8188ddf3448d31c6288d4201cc9d10d0c4ac3ee3 SHA1 c0ca31e2ddb9b2b5cbafc3eba66316e83688b808 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f SHA1 0e158f5954e4046af3bc157a1c85aab4bbcc71cb SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a -AUX wpa_supplicant.service 261 RMD160 7de0f70342a758fdb59fdf7a83cc8daaae63fb01 SHA1 a8ed3619377c4ce3b37e0fcbeea6c22c49b2b3ed SHA256 1beb5d6dd0b871ab5e3a198445627f37c6b5dcabf0bfce5b2ca8394d2042d7ea -AUX wpa_supplicant_at.service 311 RMD160 3d379f0e6fcd24197c01290b9d75443dc2cb837d SHA1 d317686301933297a56c545068c7c7eb0a44753b SHA256 8eda723e1d4a3ac5b967acaba04d39237cf286233ca03fd660c6e6d9ea60c7fa +AUX wpa_supplicant.service 264 RMD160 d8110d5d02067448c469723bddfd07f6041c5696 SHA1 0422a518f1f0137bf134a8148540ac42f4316bf0 SHA256 aa76e01677a755270147bcda08dbd8283ba37dc15e384869e874585cf5720c39 +AUX wpa_supplicant_at.service 314 RMD160 21fcd8438d384988c46da9b2c31759500f424e21 SHA1 efbfac91721f1ff71c86b0ffc554cc63366363d1 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c DIST wpa_supplicant-0.7.3.tar.gz 1638224 RMD160 e22f0440d64c943e4b0886eefa3418e75ea01b60 SHA1 ca51db8931fabf386352c87422f3e62fb44c3fe3 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 EBUILD wpa_supplicant-0.7.3-r2.ebuild 7799 RMD160 a1b42170b2758c06de3aa380616a172f9c4cfc03 SHA1 24806cfe93e29ca9cc51f787f268b4074ff4e19b SHA256 00726312f6c7f4bf71a10f981eef8c2088f53343d241bd11dacba778dd09c898 -EBUILD wpa_supplicant-0.7.3-r5.ebuild 8264 RMD160 0d662eb29213342b9034182a4f322326b9d98487 SHA1 424b4039b026a950bc296a3a8e6fb048b4764d9e SHA256 63e5fa0b03c7b45c21f971549137da1f55ef25e1304e66e6b065ff162d7f85a4 -MISC ChangeLog 34662 RMD160 89abc92d1254f678d18bca54ac88bd6e48e12136 SHA1 6e51e641c4cc884c9de0e1dd0487732e7a006353 SHA256 05f72dbcf3e3ea6dbcc86375aa93c2190a9890aaa401069feff2cd859492f28e +EBUILD wpa_supplicant-0.7.3-r5.ebuild 8690 RMD160 637f57f7319fe379b42ea1421919ae1bd7db602a SHA1 0f96f30faf9a7a8dd2c40ab5fbee32a9f81fb08d SHA256 b9a58e5a191c4b6b6f810d97cf759f2318bfa2708d7d5e548258a74d9786f8bd +MISC ChangeLog 34883 RMD160 ab9562a86e13d3948bb170f4fe2dcfd8238952ed SHA1 b056a0ac8132f108e7214e306f0ee1d676beb48c SHA256 67b941042355d79296f3ebdae04abf1f3d072194e442c139dfcbf6735ceedca8 MISC metadata.xml 832 RMD160 14771aa4f3533875b5f3f900ee513dcda354873d SHA1 01f054ebe9f2bebdf8814558085c65ce9d8a15f6 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4r/YwACgkQsR7PQhRXYEm68QCfXor958vBGPe3xyL6Ky9VCLq3 -Xy0An1WCrjbxf7T2Gx0zy422bC1cBhv7 -=nS5M +iJwEAQEIAAYFAk44ajoACgkQfXuS5UK5QB2VsQP+PjO8W5doOdQzxQpKOpIeeGmh +pHyV1LaIArw04ZAEcf3rczE2c9Lz+Jo1pWYh0cyN9ymCK3aO9wg32EHb/P87NsTO +phWOxc6uB7VazLE086R1aNsdh+OwEG1iqRwjnAhNDTppTPlcfxHpZtj7NjWyHk8u +Mqjscj63SZm87aanRgY= +=wJIv -----END PGP SIGNATURE----- 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 }