Copy 80-net-name-slot.rules migration code from sys-fs/udev.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 75 insertions, 21 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index e61533814bb4..d232a8c297cf 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.231 2014/03/01 22:37:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.232 2014/03/02 16:12:01 floppym Exp $
+
+  02 Mar 2014; Mike Gilbert <floppym@gentoo.org> systemd-210.ebuild,
+  systemd-9999.ebuild:
+  Copy 80-net-name-slot.rules migration code from sys-fs/udev.
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> systemd-204-r1.ebuild,
   systemd-208-r2.ebuild, systemd-208-r3.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 515c88129418..2dc58ce79906 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -19,26 +19,14 @@ DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45
 EBUILD systemd-204-r1.ebuild 10454 SHA256 bb451d1e1848429919359d5dd9d8d0092aa2017aa406ddbeb97cf068d1c7b3c3 SHA512 8dd6988c1a5e83778ba147e289561354e2886e5882eb78c0f873e74405a11c38afd54d5cbb97a839c43674e2a0d22c14d0742c39f7889f75543fa344b318576c WHIRLPOOL b8d9f89a5ce2543cdb4097d0f8aab3b34e83762e33bd900a11c90d65f96038f35cc4a4f53e2e90a50bd4563133c498e69a1381df9b4644e13981f346e5f90e31
 EBUILD systemd-208-r2.ebuild 11090 SHA256 cea3483f02b138f641ab8927be73eb7a19768cb0b06931e8ce4f609f0aef1f5b SHA512 46a40de993e857bfd7aad877dc2dbd397aaeed29f0015c93ef63043495a077618e2fb2b61c11b3ead85f391b2d8daa94f34b9c870be23b80eb86edbc0eda83f8 WHIRLPOOL e5a90abf71df67999a1e36d768c32ee114ee5ef5cdc478dbd1e509bb98321bbc8a26658a52dc26bed7b9d2f37c680dfeff4d00e6016d1f748f1f438890755dfd
 EBUILD systemd-208-r3.ebuild 11107 SHA256 68066f079cb400f4736370d912e070b1ad106a9027962a09fec99a4125c31ee1 SHA512 2e3aed2cbcf9a9a7803adfc8ec83d39e0925af2cc2a7b557bbe17d16c01a6e5738aad95ba72fca6c384bc48e52e13ec9706fc3471977d6c77a42d191941aff7a WHIRLPOOL 21be5e86e6b664acbdf396ac4a0eeaef53ed2eab5581da93f9d3a1c96a3e6fd72e9f9f99cd599dd8970ad44b022a4b8e24df39f83bfbb52af3f863aa0077a5e1
-EBUILD systemd-210.ebuild 11756 SHA256 cd650e00321476e04302925047820a7df85a58e4120faa6431bef3ee711d9952 SHA512 edd28c5751cb762c71c6351d277db4e62d41bd69dad6e20674413e6ed378686ed9e615b7bab21229b705520fb2b1cd40156d6af6d1e87661cf93138b8b8859c3 WHIRLPOOL ca6f1dad9bc9cc31f8ebfe3c2ba3acbae37c98563d8ba3c1b1e9dc3171e38c4c157533ee7c7e867bb6a9fdb5e0befbc1d5d62753c86b59b695b7117196ae1592
-EBUILD systemd-9999.ebuild 12148 SHA256 064fcab0fb6a4064779eed64c9f8f3c3282a1587dcacc8572cdacebe8a1c503b SHA512 d29c861b7eca9a54450c2496fe730cefef0c7f777acfe6267b4f46f954580e7a5af563c98a5f695099c59088ddcab68746ee26cde7bdccb077aa8157824b7a3c WHIRLPOOL f2e828f7e0c23ca482136bb6db19ab2b94c44e0fbf92130d7c0d716cc8b750f7373d72d30c9736c89b578f3d09928c1bf496e7b60f45624f75e58c5da906c604
-MISC ChangeLog 42892 SHA256 cf6ca3faabec1767755a3b9592ccc343e6ae02d4574967dc00d6fcbdd257f72a SHA512 41d7056b0f53f285214f352f7ffdb1e6ac0216926af2f83f2dc2873f977e9c49aaf302b93be9c4588c656840c80e22f9d1659b32ce56f028de30510f64630011 WHIRLPOOL d1ba1dffc7afc873994b94fc660b78e0b9287c7dc6456abbf48c2a843909dec7b8bd50c9a90bf889b5b94d71c1e6bea7110008763ba78d043b463a56d53692f1
+EBUILD systemd-210.ebuild 12815 SHA256 b36c750488b718fd6956e5ed41ef9efcfd7753b24daaf9df4206267d81f8524c SHA512 f9e86a93946b66f3c047ef99e06f840ffaf807faf5e61efac2c75184bab8465a39f0933cfa452775084433ed6441856f281f77243667f300360c19f67e6e1979 WHIRLPOOL eb6f9d5020568140c1186f6d156744a8fb8c78143a92af91be12de662561357cd823afbe0a5c98f5f3c5ffa434c7674aa7f4eb29ab7fda9eba8f75ca04ff2ecb
+EBUILD systemd-9999.ebuild 13207 SHA256 6d0ceca2d11269aaff167c4d0c0fbbe0d6af7d28154728b63b06b5d6099b31cd SHA512 92bbfd730917c78bd39cf5c735a72ecb89736dace67224e8af20475caebd074354e7328ea52d440fa77d5cd82bc484f14b9a37453a0f80e27077fb4869ba2613 WHIRLPOOL 844d505f48a1fb493ffa11a9dad19e208172276ec794a57772a57fd8f73d44a987294e2337f1817b3b7a51ef6db346ea4d69da44193777307bcd72eac1e8e3d5
+MISC ChangeLog 43049 SHA256 e0989845236fca2bbde732d04e4dc4599c347f82ee9b6460e478e12a3dd2725f SHA512 faa8a2b28e40f9622387c9fa4c7272f35c5d9432c8c46ad7701461edaa16dee915457ce856612d7b6590cc67486b4a50f495fd25d55989d618b2b4fd4251def3 WHIRLPOOL 0f000d046880a9bfa808f043aa498208fe7d5ec8826440b80d6f6ddc964366bbd45c514fe1438d3d3ec7c0842a09e1de0e200bad43cd842ca301e9ef5c1588b7
 MISC metadata.xml 1277 SHA256 9fd7887738589446a3c9c289d593d68e602beb06b34f7b98ff1bbb84aeb7b653 SHA512 70cf0143e3e88e2eccc5475730530e732639cee660fff5ba8572eb497c3da69433878b2ded50e0bb2f027e287d73d9dfca08dcc9a38df7da02e8427c08ed904a WHIRLPOOL 7e18b6437f6081fd1640e2977d1657ca5db0acecb0f9e606ad8cd8c3280ba467596cce13cf1cf24d4e34545424252cf6ee5f13030f111dd0334fd6b1f999a83e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTEmEWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdxEQALmevsgkVZkG9uZ1IaI2ROLA
-c2t8QNz15J2o4c0yJrlhu9CrUbHa9KUepYn9z4h5IThoioxUDBIM6ZzP0i4CblG/
-yHkAUs/2MfwNiy//ACtr19yo+AdS9QFRmHYoadG97xbppgVTqEkxMtg3wNfScC6/
-QWGSsIFNyQoXfzIjInm17ssCMu+e0Pe1/hrLcKnHfKYZlWtIh+oBFQYLkSkt9PQh
-OaJwA/ScGfr8weHka4RJMp8cy25pdSf2tfhNoGWquTLM0xKEE8l+1e1Qj/6B5PBP
-mET4p/euVjL+UVbSzx9L2yItAZRUxW7LCz7MsIoorp8mXBU6ghQQbSRRpab+k086
-j58pHthj2ij+yyrUdvVVHJyg62St9RYs867BVNn8cz9oeivGgL9Rq53Offt9pC6p
-PiJA+vlwB9G8eYu0PqnUoIx5G38x/DtGRWSBn8PfHAgeIWJH+rBhzwYCVH7FHkMb
-Q9omh+gppieApdi39ifmN9XdKuI33hJT7Sn903ZnYDFOn7HdL8ft+y/3U5cn+kjq
-aUkH8wt+U8vEloGoA1jMS2nvz0NYQjIZ7O5qoqdnvs61/XXRILCIuL6l614zvLWf
-iz3T/odL8b73wMAapoQC3QhUBQid/a1sEAOrIYKWyE+nm59mLa1XfofS+R4W+RDG
-RJRAMgwNg3UIW47NiMNJ
-=GmZj
+iF4EAREIAAYFAlMTWFMACgkQC77qH+pIQ6TDOgEAkUbHSPHvlDKjW/mVTWgiPB3E
+B37iMvwBtdKhXOIN6P8BAJ2/nuTCOBkEuNHCy0PCYMbeAVXAXtsUwzBGEXMdy/g0
+=UjiN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-210.ebuild b/sys-apps/systemd/systemd-210.ebuild
index 348fb82c51f2..3a9df6ef2e35 100644
--- a/sys-apps/systemd/systemd-210.ebuild
+++ b/sys-apps/systemd/systemd-210.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-210.ebuild,v 1.3 2014/02/26 03:36:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-210.ebuild,v 1.4 2014/03/02 16:12:01 floppym Exp $
 
 EAPI=5
 
@@ -352,6 +352,34 @@ migrate_locale() {
 	fi
 }
 
+migrate_net_name_slot() {
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${EROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
+		net_move=yes
+	elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+		net_move=yes
+		net_name_slot_sym=yes
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $? || FAIL=1
+	fi
+}
+
 pkg_postinst() {
 	enewgroup systemd-journal
 	if use http; then
@@ -375,6 +403,9 @@ pkg_postinst() {
 	# between OpenRC & systemd
 	migrate_locale
 
+	# Migrage 80-net-name-slot.rules -> 80-net-setup-link.rules
+	migrate_net_name_slot
+
 	if [[ ${FAIL} ]]; then
 		eerror "One of the postinst commands failed. Please check the postinst output"
 		eerror "for errors. You may need to clean up your system and/or try installing"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 766b5be16df4..93f689b04a3d 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.95 2014/02/26 03:36:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.96 2014/03/02 16:12:01 floppym Exp $
 
 EAPI=5
 
@@ -373,6 +373,34 @@ migrate_locale() {
 	fi
 }
 
+migrate_net_name_slot() {
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${EROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
+		net_move=yes
+	elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+		net_move=yes
+		net_name_slot_sym=yes
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $? || FAIL=1
+	fi
+}
+
 pkg_postinst() {
 	enewgroup systemd-journal
 	if use http; then
@@ -396,6 +424,9 @@ pkg_postinst() {
 	# between OpenRC & systemd
 	migrate_locale
 
+	# Migrage 80-net-name-slot.rules -> 80-net-setup-link.rules
+	migrate_net_name_slot
+
 	if [[ ${FAIL} ]]; then
 		eerror "One of the postinst commands failed. Please check the postinst output"
 		eerror "for errors. You may need to clean up your system and/or try installing"