Add more information on persistent net rules and clean up ewarns.

this closes #433746 and #434626.
Thanks to James Le Cuirot and Pacho Ramos.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux i686

4 files changed, 58 insertions, 45 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index be556f358c60..126105ffadd3 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.719 2012/09/10 21:34:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.720 2012/09/10 22:45:14 williamh Exp $
+
+  10 Sep 2012; William Hubbs <williamh@gentoo.org> udev-189.ebuild,
+  udev-9999.ebuild:
+  Add more information on persistent net rules and clean up ewarns. this closes
+  #433746 and #434626. Thanks to James Le Cuirot and Pacho Ramos.
 
   10 Sep 2012; William Hubbs <williamh@gentoo.org> udev-189.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index bb570f7ec7ab..f1092ab8aa03 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -25,15 +25,15 @@ EBUILD udev-149.ebuild 16479 SHA256 7ffa5b9e1d6793684d1f54f6d50d14d3eec3320f7a67
 EBUILD udev-151-r4.ebuild 16792 SHA256 b9821f05b54788b589b142c61149ce0e8529e58adb613cdc74ae1eb3a66d3bae SHA512 75dd32b0aba3c0cff242898fb499cb90908f392f728e4ef1103efbef0e616658828c7b5910c4e1c63aeaa844ee0667596c38ec8cc35a753c8690b06bc5a1d6e8 WHIRLPOOL fdfa2322fd5d6b1dd08a2832ef64d4c7de4205dc7281be2375fc0cb4546459c34e33d5d13e9582907dd14409490418aaef71678e76e6991b6893d5fe9aab934f
 EBUILD udev-164-r2.ebuild 15167 SHA256 67a6c8d34f108db1fa01219cb9085d997c3b5bed954f57dffc6b99fcb2ee1976 SHA512 a2e9eead578d25300e878e6c7d24f471be03541dc3efbde207a8cd12042283769b8786ccbd632d87456caf235670ee1d4504289a0ed032309347c4504d64b71f WHIRLPOOL 82c32c18a8ca7161fafc649bc6de48c3d76ee3e24dcb2e324adaf6377645930da473c6f22f0a4e081f2ee23c01431f07caa0d2b4f3ffb69d5de50e3dfc2403d5
 EBUILD udev-171-r6.ebuild 15731 SHA256 f56cc93b03d4125ec219f6f624ae614135741deeee38400736d61e3a52d6d7a5 SHA512 66487fd52d54a10978e899680bceb8bec1612ed08f81755b53292ff374d8f7eb90ee81b47977e0cf0f24e0902f8bfe1d3f37ae8b78dfa3272dcc38e4d31ecceb WHIRLPOOL a6502c598dc89c5dcb91ebbd2af218460be85ed279b7c0bef60e39e7defda5100d36a82879063f2242ac88978214b405e6964087dd592720d3aae76f60f25fd0
-EBUILD udev-189.ebuild 10737 SHA256 13a84be4a9bef4247b730cd8a19aa710c41397072c565356a598df70f2bd9910 SHA512 361dca386d572e80e71e0ae937eec333f62b07907cf2b5ff64b2ae0917ca32dc04c9cac4dadd41034cc554890e53fcf5077032d5e7b7a3295dce728acebcd038 WHIRLPOOL e132335c5d4ee2f10a937e72dca7095ee36cb16abc14d805276bbd0805327b65d41f4d26d10b64d6420a49949543b85e22fab29fb05d57d8407e65e532296ae9
-EBUILD udev-9999.ebuild 10739 SHA256 8d5d40da01c0403c0bd0d9f0a966e28844e3257f3d3c8c5470934e27f72d1c86 SHA512 70ff9ffeaab620c9ed23129dbb212671bca5b8bcecad3dbefeb99ce9b081513401e0b475c7dfdf9ccfa7878b704af8bfee79f9a04265bf2c126214bc9ccb172a WHIRLPOOL 7fc6754d02d66c05e691902f788805ede963736ff17ddfe17ab7739a7d0596736156a19f82c218ae2bb46b33460dbca25d19acb1481ea2e8631f3f574509c126
-MISC ChangeLog 40356 SHA256 7023eaaaff721880fa819a727fb97e0551ed3e9102327bf084202d40bb9a1a5f SHA512 54b85ba6d32cbac21611acff29f54fb6cb430f529628abe47bf81fc3adee5bc6ec2b016b57e8d200db2589e69e1fbdcef85e5d9d6dff24a5aae525de8857f395 WHIRLPOOL 72221a56c1617bcaf1df2657c7683581676ee0ed80c11918c828625a9add6aedd830bf643e7a43595a191398e5d97e583ae8c61f82762cddb7063eabfe31a694
+EBUILD udev-189.ebuild 11032 SHA256 83ce0805964935c30ed96ae768307107bc3a5cc11af5ee6b9d275fd97ddbae9f SHA512 89fcbcaa3ad52c1cd6c0fccad435b41970aa4d6ffbb3655775d60cf02a449e3aa5b6b6075eddcfedcb6c2c107ad27304f604c4de3a551be17309c7af01dfb79c WHIRLPOOL e162cc8a91c3788f6abb186454504e90652e141c0e72911480d57add05c7d014814cead83827af36659f1836e25b4a9c28d2ca94532e627a5553e1af1880a0b1
+EBUILD udev-9999.ebuild 11034 SHA256 63e4ff7351c3e6c2ad9c57ac891c91ad421cde434b30d7f2ea996317c0678719 SHA512 5d7f0a977b67dfa085b971a2de19bab7113500827316f70b05071ce466c25bada4696e02e3b431cfd8a5f7b078324c0a412461e92273f8abd2795e04b652b5d2 WHIRLPOOL f9c1cdd4cbe6c36999414c958cb7c6c0f4d4a0f2d5460d50389268ade7aee8e4ee4bc36bb1bbe59da7940f077b33625d8ab466f76e5c3248a062990615cdda3d
+MISC ChangeLog 40591 SHA256 d7663e664d186297c6ba1e2ace8acc48cafbe25f65fe236c27fbb682dd70441b SHA512 b5937f0349c19b548504df59a27f13b36b0b3e327f23ceaecb9644714168b3b45719ac5b26e15f4b42a8b9cd205f0978a1dabedf2e3ffdb874c6772280ec5947 WHIRLPOOL eba6fb70ae630cc1b99b475eef02677fd66e23f923718ed304f20ef70e023efe1119ca775737573816d6d7b9b99028c9d4ab0309168273a7e2087bbee752ec82
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBOXRUACgkQblQW9DDEZTg6JACcCOKSKbW5k0yNPPbshMRKvN96
-JwkAoIXySmuI6cEhg2TABzWHto1LTw1G
-=1jJA
+iEYEAREIAAYFAlBObYcACgkQblQW9DDEZTjLdACgr81XJ0KUWbZOzbHm95L6knQx
+u4IAoKPwLN0ImdFDanTTAXO3FyWvCxE4
+=xD8t
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-189.ebuild b/sys-fs/udev/udev-189.ebuild
index 26ad36f90303..7b5d82863709 100644
--- a/sys-fs/udev/udev-189.ebuild
+++ b/sys-fs/udev/udev-189.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-189.ebuild,v 1.2 2012/09/10 21:34:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-189.ebuild,v 1.3 2012/09/10 22:45:14 williamh Exp $
 
 EAPI=4
 
@@ -344,18 +344,16 @@ pkg_postinst()
 	fi
 
 	ewarn
-	ewarn "If you build an initramfs including udev, then please"
-	ewarn "make sure the /usr/bin/udevadm binary gets included,"
-	ewarn "and your scripts changed to use it,as it replaces the"
-	ewarn "old helper apps udevinfo, udevtrigger, ..."
+	ewarn "If you build an initramfs including udev, please make sure the"
+	ewarn "/usr/bin/udevadm binary gets included, Also, change your scripts to"
+	ewarn "use it,as it replaces the old udevinfo and udevtrigger helpers."
 
 	ewarn
-	ewarn "mount options for directory /dev are no longer"
-	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
-	ewarn "as for other directories."
+	ewarn "mount options for /dev are no longer set in /etc/udev/udev.conf."
+	ewarn "Instead, /etc/fstab should be used. This matches other mount points."
 
 	ewarn
-	ewarn "Rules for /dev/hd* devices have been removed"
+	ewarn "Rules for /dev/hd* devices have been removed."
 	ewarn "Please migrate to libata."
 
 	ewarn
@@ -378,20 +376,22 @@ pkg_postinst()
 		ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
 	fi
 
-	ewarn
-	ewarn "The udev-acl functionality has been removed from standalone udev."
-	ewarn "If you are using standalone udev, consolekit handles this"
-	ewarn "functionality."
+	if use acl; then
+		ewarn
+		ewarn "The udev-acl functionality has been moved."
+		ewarn "If you are not using systemd, this is handled by consolekit."
+		ewarn "Otherwise, you need to make sure that systemd is emerged with"
+		ewarn "the acl use flag active."
+	fi
 
 	if [[ -d ${ROOT}lib/udev ]]
 	then
 		ewarn
-		ewarn "This version of udev moves the files that were installed in"
-		ewarn "/lib/udev to /usr/lib/udev."
-		ewarn "We include a backward compatibility patch for gentoo to"
-		ewarn "allow the rules in /lib/udev/rules.d to be read. However,"
-		ewarn "bugs should be filed against packages that are installing"
-	ewarn "files in /lib/udev so they can be fixed."
+		ewarn "This version of udev moves the files which were installed in"
+		ewarn "/lib/udev to /usr/lib/udev. We include a backward compatibility"
+		ewarn "patch for gentoo to allow the rules in /lib/udev/rules.d to be"
+		ewarn "read; however, bugs should be filed against packages which are"
+		ewarn "installing things in /lib/udev so they can be fixed."
 	fi
 
 	ewarn
@@ -403,6 +403,10 @@ pkg_postinst()
 	ewarn "Upstream has removed the persistent-net and persistent-cd rules"
 	ewarn "generator. If you need persistent names for these devices,"
 	ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d."
+	ewarn "Be aware that you cannot directly swap device names, so persistent"
+	ewarn "rules for network devices should be like the ones at the following"
+	ewarn "URL:"
+	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=433746#C1"
 
 	preserve_old_lib_notify /$(get_libdir)/libudev.so.0
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index aa1a0f88aea6..789f3ecc7867 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.111 2012/09/10 21:34:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.112 2012/09/10 22:45:14 williamh Exp $
 
 EAPI=4
 
@@ -344,18 +344,16 @@ pkg_postinst()
 	fi
 
 	ewarn
-	ewarn "If you build an initramfs including udev, then please"
-	ewarn "make sure the /usr/bin/udevadm binary gets included,"
-	ewarn "and your scripts changed to use it,as it replaces the"
-	ewarn "old helper apps udevinfo, udevtrigger, ..."
+	ewarn "If you build an initramfs including udev, please make sure the"
+	ewarn "/usr/bin/udevadm binary gets included, Also, change your scripts to"
+	ewarn "use it,as it replaces the old udevinfo and udevtrigger helpers."
 
 	ewarn
-	ewarn "mount options for directory /dev are no longer"
-	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
-	ewarn "as for other directories."
+	ewarn "mount options for /dev are no longer set in /etc/udev/udev.conf."
+	ewarn "Instead, /etc/fstab should be used. This matches other mount points."
 
 	ewarn
-	ewarn "Rules for /dev/hd* devices have been removed"
+	ewarn "Rules for /dev/hd* devices have been removed."
 	ewarn "Please migrate to libata."
 
 	ewarn
@@ -378,20 +376,22 @@ pkg_postinst()
 		ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
 	fi
 
-	ewarn
-	ewarn "The udev-acl functionality has been removed from standalone udev."
-	ewarn "If you are using standalone udev, consolekit handles this"
-	ewarn "functionality."
+	if use acl; then
+		ewarn
+		ewarn "The udev-acl functionality has been moved."
+		ewarn "If you are not using systemd, this is handled by consolekit."
+		ewarn "Otherwise, you need to make sure that systemd is emerged with"
+		ewarn "the acl use flag active."
+	fi
 
 	if [[ -d ${ROOT}lib/udev ]]
 	then
 		ewarn
-		ewarn "This version of udev moves the files that were installed in"
-		ewarn "/lib/udev to /usr/lib/udev."
-		ewarn "We include a backward compatibility patch for gentoo to"
-		ewarn "allow the rules in /lib/udev/rules.d to be read. However,"
-		ewarn "bugs should be filed against packages that are installing"
-	ewarn "files in /lib/udev so they can be fixed."
+		ewarn "This version of udev moves the files which were installed in"
+		ewarn "/lib/udev to /usr/lib/udev. We include a backward compatibility"
+		ewarn "patch for gentoo to allow the rules in /lib/udev/rules.d to be"
+		ewarn "read; however, bugs should be filed against packages which are"
+		ewarn "installing things in /lib/udev so they can be fixed."
 	fi
 
 	ewarn
@@ -403,6 +403,10 @@ pkg_postinst()
 	ewarn "Upstream has removed the persistent-net and persistent-cd rules"
 	ewarn "generator. If you need persistent names for these devices,"
 	ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d."
+	ewarn "Be aware that you cannot directly swap device names, so persistent"
+	ewarn "rules for network devices should be like the ones at the following"
+	ewarn "URL:"
+	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=433746#C1"
 
 	preserve_old_lib_notify /$(get_libdir)/libudev.so.0