Disable the new predictable network interface name scheme if sys-apps/biosdevname is installed.

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 54 insertions, 25 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index cb6121e29e56..a2db79ba04a0 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.799 2013/01/23 20:41:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.800 2013/01/24 03:13:09 ssuominen Exp $
+
+  24 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
+  udev-9999.ebuild:
+  Disable the new predictable network interface name scheme if
+  sys-apps/biosdevname is installed.
 
   23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
   udev-197-r4.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index ebfa1cb8ee56..346eac91e730 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -12,19 +12,19 @@ DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903
 DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
 EBUILD udev-171-r10.ebuild 16106 SHA256 c9e107c27107cfe9c9e3cba319d7280b4510f0b466222354f45c6c8664b48371 SHA512 79a62ae8e519a7cf2e0e78f5d87d7d046ef14ea0571bf20e51b1121927e40b67069291ed050610541422c47535c1d85b6f2f3001078fe2f73d89878fdd3782a3 WHIRLPOOL 770759c3c24ed66d0ebda92517a096f91f4d644af276116f21c4acb9625644e33f9441927fe75167786df2e6400635622670e7a5cb6056f5311222537982f065
 EBUILD udev-197-r3.ebuild 13735 SHA256 ac61acb109e7424cf85e152d6360e84482086e8ba12fbe05742a298b17056246 SHA512 e875d392b0c0ad37df7bd626a9cfe3290f2c11a4e1fc627d45b43fe88b4850f39c9d1c7b6eabe843bb8e1e3114b0c48886e09c5a7663009a87e3a2369a0291c1 WHIRLPOOL b59be076b0aa81395836256be44327e50bf75dbde789068862671c55d35c461cd9faa433bacbb616ab1eeaf1658b55461669d5d9b6154dc97394f1c7b0b91943
-EBUILD udev-197-r4.ebuild 14284 SHA256 4ee3bb5ee8f1ea89de52f90942ab6632094535983a09544951c9295aa1163260 SHA512 c6acfeaef8e94b51e2556c342be5a230473918485d3d6f72dc5937f14858cc77aeb7295946a1fefa768e63383741ecddeaab8faa16b5530897fe7565ef3e1a3a WHIRLPOOL be656a3089bb01b1349e4f48e6b0dfdc87c1167678259099df244d67297eb8e1cd34832ead810f83b1f9ef793b5e6367f992f4a9a4108e8327e5d8b430147fb7
-EBUILD udev-9999.ebuild 14282 SHA256 1088a76a19c273ba09a17975b65c64f33a5205bf7b25a050641f4b037087f6a5 SHA512 3135bfedd25fe2a536d1bff43f2423e76039d56c371ab6811d06e5fb50adfef839c042b57c80f799bd2c2b9e59fbded8772e8dd52a56ba41ba602453b2f00c07 WHIRLPOOL ff51ba43d75f49a89c4a90b3d0a64cc6370613948fde26a43a8909bf9337238891510faae410f589490e40a5f7d7c999959dd8328599c57c6b6b9ea13115f372
-MISC ChangeLog 52629 SHA256 7d8a4ad90e4154d7076c59d014f547db5b3c687d80e5de2e2ee0969d579be46f SHA512 20a793eca9326fa8eb76cf51f75f931146dc022381b4cd4a45b1f05995b17427efb188c07956aa1626f5d568c75a7c8cc278db38b5267a4d6a365dca553fd98c WHIRLPOOL 2cd5fddaf88946b69d174c61a2425e08c9f02f0b7c75faca0bedb481fc7e94774bfe7850f5458256c99722ba177b9a0483b990ce88939f27e1d46189a39c42ac
+EBUILD udev-197-r4.ebuild 14643 SHA256 698af73f2db709be45d6b27434029d1af9c937f711107ad6638c7d5818742845 SHA512 2f1f99b15589e06a41eb4e9b9c049840637541bcdb8fde5a643900d4613b8974a50e3576f3a4c1966e83188315a95a4399be791a1f752200a9c652bbbc229393 WHIRLPOOL fdd2b215b4f8a56fdbadac2047774e4643edffc9fb189ab14b1949d6fc1ab6f6018a37dc8ff1252eb446f14a76d1d63c34b725a73d9f69484ec85e702a5999a9
+EBUILD udev-9999.ebuild 14641 SHA256 f698e097e3d0a3fa78b97a00a400a84ed58581de514245ce7e3bf86a0b9c84a3 SHA512 1b472f7b300028556cbace7fee19f1a84cf1634ab5607f654d35fb3af1ae9412c2c26ded275574a85c3601db9871aba0d36aa52669db9d68b63c51c1124b3a02 WHIRLPOOL bdd0b6cce28cf46825ae904ada1d24f6c061d2a23881daf7ca336b9660a9b8a6af4d79b4e8a3887d379f40378bb7e320e437f55af571dde1e154cefed3b7402f
+MISC ChangeLog 52824 SHA256 36e80b57f522da4d60743b20717ab1efd1832145d889d3360b1873c1664cbe00 SHA512 1889a86d7fd0bfbf35975fd169435dd4aef14fd963f15033c508b3c72de5bc3e7834cd20f42a4e0a0b5b063b5b3dcdb2e60c4a8a61ef1204e4781c15061ef0e6 WHIRLPOOL fa66b9c1ba38dde2a2cc11bb6a490ddd81d37b4ccfc49bcff0dc573ce2566fdf432a76a948fd33d94eb956a25848185a18a733d00be5f5565304174a541ba782
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1098 SHA256 69d8c28e0c2439c252068ae2e0141a9bad7b05e65b9dec27aa2dd3feb4f2393c SHA512 87354f467c3f2ed005a10652a2f80ffda010fbc0c6fb88436b906c92f4cf1543ed1a6cf4a49c93f15c6fea3ba0dcd108e1e120954f7b0860e7ac90072d2b3d67 WHIRLPOOL 9c01df67041d2093e5a2ee4a9ad65df613cdcb163bc366c8592e8e2be84b176da13198261a012687188918c906291d765856665806efe03b8dfb22a5b4eb6834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAEw/AAoJEEdUh39IaPFNQw4H/RzxCmU3Ab8KnEyhnAgEgNV7
-SEzMiQ1ybk2tNeotZ5TYIh2Lg/6zxNXzpojgxPgcQA5NsdX76g6wQKsSHTGC+3fh
-dW3fLwesFqlPxIbnT3nZR/V9cEsKdKopwOxMnQY/vlrH1q8l+fAIkYpLAGObEUbb
-X039Q2P2v2ASbScqki2SogUnuMxvcN6EjlTtBjTlWmjVBZLotMhl+qw31VijJAV2
-TrGUbr9OZBx5aBls2spV/B8vNr+iLTONk/79l28xvKKG5LqEUCbakFcst4U4MfNw
-nBS777d4x12dvuSCg4gihgt8uKslNc6GQPj3yP7n0z3dz6a4hS3OkkITXHEAwro=
-=WpV/
+iQEcBAEBCAAGBQJRAKa7AAoJEEdUh39IaPFNpUgH/0w5HC8fiKdbHs8NvBAqGn5f
+9pqUD37GmTuCoU5ESMCxCPrZ5xjtVumqFIpnd1+HZcFZ94iZlt/Xp8rxn0BYty+g
+wqvxHZEjxGychOaEH1ZeQQ1tDBHjD3rQCJ5zU74+PHKS0jQIqyxdA8I6fyArT2WN
+2z8SFBzeNtTZ8bjzqQsR0alG57AOXpQu9A8VTeBYTAGHg4nQEf6iQj6qTNoNFbMa
+BlinEJekK4nRq1whem/MPSS5DP4c36riRg2TNE8m4vCSCblLs2WidfQdt4gCqfuT
+5MgU3rj7OVZEh6Ln5m1J6i6MyI5S8HdjIvFIvj1hf0KbtUaG1h2a9s28ibMqdGA=
+=K1xh
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-197-r4.ebuild b/sys-fs/udev/udev-197-r4.ebuild
index aaa7e444293f..75dd1c7b3127 100644
--- a/sys-fs/udev/udev-197-r4.ebuild
+++ b/sys-fs/udev/udev-197-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.18 2013/01/23 20:47:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.19 2013/01/24 03:13:09 ssuominen Exp $
 
 EAPI=4
 
@@ -397,17 +397,29 @@ ismounted()
 
 pkg_postinst()
 {
-	mkdir -p "${ROOT}"/run
+	mkdir -p "${ROOT}"run
 
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
+	copy_net_rules() {
 		net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
 		[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
+	}
+
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
+		ewarn "Because this is a upgrade we disable the new predictable network interface"
+		ewarn "name scheme by default."
+		copy_net_rules
+	fi
+
+	if has_version sys-apps/biosdevname; then
+		ewarn "Because sys-apps/biosdevname is installed we are disable the new predictable"
+		ewarn "network interface name scheme by default."
+		copy_net_rules
 	fi
 
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
 	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT}"/dev/loop 2>/dev/null
-	if [[ -d ${ROOT}/dev/loop ]]
+	rmdir "${ROOT}"dev/loop 2>/dev/null
+	if [[ -d ${ROOT}dev/loop ]]
 	then
 		ewarn "Please make sure your remove /dev/loop,"
 		ewarn "else losetup may be confused when looking for unused devices."
@@ -418,10 +430,10 @@ pkg_postinst()
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
-	if [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+	if [[ -f ${ROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
-			rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
+			rm -f "${ROOT}"etc/udev/rules.d/64-device-mapper.rules
 			einfo "Removed unneeded file 64-device-mapper.rules"
 	fi
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index cfab3f2d6d8d..3adcd949e684 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.160 2013/01/23 20:47:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.161 2013/01/24 03:13:09 ssuominen Exp $
 
 EAPI=4
 
@@ -397,17 +397,29 @@ ismounted()
 
 pkg_postinst()
 {
-	mkdir -p "${ROOT}"/run
+	mkdir -p "${ROOT}"run
 
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
+	copy_net_rules() {
 		net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
 		[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
+	}
+
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
+		ewarn "Because this is a upgrade we disable the new predictable network interface"
+		ewarn "name scheme by default."
+		copy_net_rules
+	fi
+
+	if has_version sys-apps/biosdevname; then
+		ewarn "Because sys-apps/biosdevname is installed we are disable the new predictable"
+		ewarn "network interface name scheme by default."
+		copy_net_rules
 	fi
 
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
 	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT}"/dev/loop 2>/dev/null
-	if [[ -d ${ROOT}/dev/loop ]]
+	rmdir "${ROOT}"dev/loop 2>/dev/null
+	if [[ -d ${ROOT}dev/loop ]]
 	then
 		ewarn "Please make sure your remove /dev/loop,"
 		ewarn "else losetup may be confused when looking for unused devices."
@@ -418,10 +430,10 @@ pkg_postinst()
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
-	if [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+	if [[ -f ${ROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
-			rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
+			rm -f "${ROOT}"etc/udev/rules.d/64-device-mapper.rules
 			einfo "Removed unneeded file 64-device-mapper.rules"
 	fi