Do only recommend to reboot instead of trigger for re-creating persistent-rules, suggested by Kay Sievers. Cleanup some messages.

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r1 i686

7 files changed, 48 insertions, 53 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e5366d268138..b548e211c701 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.422 2008/11/26 06:53:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.423 2008/11/28 12:51:54 zzam Exp $
+
+  28 Nov 2008; Matthias Schwarzott <zzam@gentoo.org> udev-122-r1.ebuild,
+  udev-124-r1.ebuild, udev-125-r2.ebuild, udev-130-r1.ebuild,
+  udev-133.ebuild:
+  Do only recommend to reboot instead of trigger for re-creating
+  persistent-rules, suggested by Kay Sievers. Cleanup some messages.
 
   26 Nov 2008; Matthias Schwarzott <zzam@gentoo.org> -udev-130-r2.ebuild,
   -udev-132.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 0eddfc850d33..19e180546d3b 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -48,17 +48,17 @@ DIST udev-133.tar.bz2 445588 RMD160 c1f2cdbcd168c6d44bb9ff673e2d73e52bde3aa7 SHA
 EBUILD udev-114.ebuild 9031 RMD160 1b7e45d1a384c52a336727a17e6fbd087855fb34 SHA1 207b330f01cb9970eee14b4c39b7bf2d5b9ce181 SHA256 f45fda83e1308079b9d932586b07acf2d7bf65527f8b414c8d43738fd0c129e5
 EBUILD udev-115-r1.ebuild 10108 RMD160 86ec04530480872e2ac1fbb2fa37fa2819639752 SHA1 1021b13461ac7625f97a60634982416c2a8dddc4 SHA256 765135b405bd90ee6c527c0be00e87c12400121e30261de9ba6d3e4a3c50f872
 EBUILD udev-119.ebuild 10145 RMD160 7b978b270ce5d39443310b7da58aa5ff4bdd02f9 SHA1 fdd10d47bb62517d78f0e7d811903203b4cc3d8e SHA256 2998cfa7681f16132aaad0a8a033e83418c4e418430cabf5ebf1d8631fcc58bd
-EBUILD udev-122-r1.ebuild 10691 RMD160 64e56d50e767de48d77e8d0c7f88b2a04adbe211 SHA1 e7264e5edd79b0ee1b1d52cbaa4fc17697737a49 SHA256 c9ec083656534c838651de577a08a2ece6036bca6c5d817c1ff7a309cc007863
-EBUILD udev-124-r1.ebuild 10735 RMD160 614726833a426384a30ae404248395a6c49e53c7 SHA1 96f0ee86df5313d3d3c450d6c45acc86520b6199 SHA256 dc219f7aebf17e772a3225513ce9cf9e47138db26491a9ce4d989cf19c7a0141
-EBUILD udev-125-r2.ebuild 10732 RMD160 58b821e085c1fc3f28772b9ab3e72adfa268a1cf SHA1 d88144b2b150f4eda308a37a8cc06d760ef1cc20 SHA256 fb7efdc754565d7ae3e6e5922aa9919cd23c37ca23b0174493c743b180a91bdf
-EBUILD udev-130-r1.ebuild 9544 RMD160 9bb3e52fe62d0f6e87ca6993cfb23823a66f0c9a SHA1 234d67af61d1217d956e150427a1ded1acb46c22 SHA256 3b4f71c6911717532e9c76e089bce20685ab56b0e75bd608e791b067c35e44ca
-EBUILD udev-133.ebuild 12267 RMD160 720b99a3fb529fcdf2720ebf88189b7eb3e63719 SHA1 cc235606497a2400690bd31323d01ad2bef69721 SHA256 0fc694bde5c6f9a9d0df2d486b225a56990c6ab115613d7b79be0086c636b7d4
-MISC ChangeLog 86518 RMD160 002c3a71766ef0e15ef25f53c20c0704d5142c53 SHA1 2ee6034e891efddfda4a21d7696f8264f645b7db SHA256 673caf013df3cd020a99900a2fc12e609feb8844784492c36d85fc589a6c07bc
+EBUILD udev-122-r1.ebuild 10607 RMD160 c97e2809e9af5c6598885637f80f3f437ce8aab3 SHA1 1a8043079b501834f195720f4d74ba1032003832 SHA256 04b0f34429d69249294d4ccef64f0bdcf3f9c166c56c892cc519182de31c1337
+EBUILD udev-124-r1.ebuild 10653 RMD160 9d784405a7d3c9e12e9d94fe0ed44d4e72b2deae SHA1 90351aa9b50adaeb58862e5ad84aa5b51ca5d4c7 SHA256 418031a715e2b8a223fe832e54864a7f0e6ba96798bda7c020b56d48c48a0bc1
+EBUILD udev-125-r2.ebuild 10651 RMD160 29da75ff13c83b7f6d2872f83c74a49b2651d489 SHA1 f653d53b1b2639ee29a6d97a687624e437dbd9c7 SHA256 6803e25e130cffaa85080ce362d6dbd5722b57d46e1aa07b7586b691ada65e5a
+EBUILD udev-130-r1.ebuild 9463 RMD160 2c8b5dfb1e7b782ea1bd7e7b43d41f3ba3caadb5 SHA1 f91d861c714d944002e0609efe13a2b78bdaa99a SHA256 2669c6f1cff7c8acc5b43cf0a0720df76c8b6a914c30ba6aacba257b96210dfe
+EBUILD udev-133.ebuild 12181 RMD160 9c69661fddeb4100b46aaa0dfc1d979e12b2ce45 SHA1 435455f10652935300e4130a0d8e0f79d35e873f SHA256 6b69fd2ca2dd17583618665fb46e3aac4569806d8f16f54366cbe52e64f335ba
+MISC ChangeLog 86807 RMD160 2fa6b992697386a46dfc4b25093aa5ba1d9ba683 SHA1 bc34796dd177936c5cba0cd89bdfef1d3d22d065 SHA256 3d52f10244724cbb4efe79bc63fbb7e897e177aba41bf77aa2a5f4f6bfdcb3dd
 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkks8oIACgkQt2vP6XvVdOcRyACgtW68RWMDEm4Vl+JwJBj7eyii
-ejwAnjhp/qX/REqRbXKp+s5MkEhyU/RW
-=wm5/
+iEYEARECAAYFAkkv6XIACgkQt2vP6XvVdOfO/ACfXrK7FWY7jvSanze8XXAGV0Y2
+gzMAnig/kqZqLnrDyERGm+AxeftfNNOC
+=E+OW
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-122-r1.ebuild b/sys-fs/udev/udev-122-r1.ebuild
index 195d57653c7a..f44716f68ae4 100644
--- a/sys-fs/udev/udev-122-r1.ebuild
+++ b/sys-fs/udev/udev-122-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild,v 1.3 2008/11/28 12:51:54 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -334,14 +334,12 @@ pkg_postinst() {
 	# requested in Bug #225033:
 	elog
 	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with persistent-net rules,"
+	elog "If you have problems with the persistent-net rules,"
 	elog "just delete the rules file"
 	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then trigger udev by either running"
-	elog "\tudevadm trigger --subsystem-match=net"
-	elog "or by rebooting."
+	elog "and then reboot."
 	elog
-	elog "This may number your devices in a different way than it is now."
+	elog "This may however number your devices in a different way than they are now."
 
 	if [[ ${ROOT} == / ]]
 	then
diff --git a/sys-fs/udev/udev-124-r1.ebuild b/sys-fs/udev/udev-124-r1.ebuild
index 2b2f128a4b03..ba5e05c36c5d 100644
--- a/sys-fs/udev/udev-124-r1.ebuild
+++ b/sys-fs/udev/udev-124-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild,v 1.9 2008/10/27 06:02:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild,v 1.10 2008/11/28 12:51:54 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -335,14 +335,12 @@ pkg_postinst() {
 	# requested in Bug #225033:
 	elog
 	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with persistent-net rules,"
+	elog "If you have problems with the persistent-net rules,"
 	elog "just delete the rules file"
 	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then trigger udev by either running"
-	elog "\tudevadm trigger --subsystem-match=net"
-	elog "or by rebooting."
+	elog "and then reboot."
 	elog
-	elog "This may number your devices in a different way than it is now."
+	elog "This may however number your devices in a different way than they are now."
 
 	if [[ ${ROOT} == / ]]
 	then
diff --git a/sys-fs/udev/udev-125-r2.ebuild b/sys-fs/udev/udev-125-r2.ebuild
index b738906c9c96..95f7aa301425 100644
--- a/sys-fs/udev/udev-125-r2.ebuild
+++ b/sys-fs/udev/udev-125-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild,v 1.1 2008/08/03 11:45:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild,v 1.2 2008/11/28 12:51:54 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -334,14 +334,12 @@ pkg_postinst() {
 	# requested in Bug #225033:
 	elog
 	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with persistent-net rules,"
+	elog "If you have problems with the persistent-net rules,"
 	elog "just delete the rules file"
 	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then trigger udev by either running"
-	elog "\tudevadm trigger --subsystem-match=net"
-	elog "or by rebooting."
+	elog "and then reboot."
 	elog
-	elog "This may number your devices in a different way than it is now."
+	elog "This may however number your devices in a different way than they are now."
 
 	if [[ ${ROOT} == / ]]
 	then
diff --git a/sys-fs/udev/udev-130-r1.ebuild b/sys-fs/udev/udev-130-r1.ebuild
index ed02b9af2ffd..5ef180831ce0 100644
--- a/sys-fs/udev/udev-130-r1.ebuild
+++ b/sys-fs/udev/udev-130-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild,v 1.1 2008/10/09 08:56:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild,v 1.2 2008/11/28 12:51:54 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator autotools
 
@@ -292,14 +292,12 @@ pkg_postinst() {
 	# requested in Bug #225033:
 	elog
 	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with persistent-net rules,"
+	elog "If you have problems with the persistent-net rules,"
 	elog "just delete the rules file"
 	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then trigger udev by either running"
-	elog "\tudevadm trigger --subsystem-match=net"
-	elog "or by rebooting."
+	elog "and then reboot."
 	elog
-	elog "This may number your devices in a different way than it is now."
+	elog "This may however number your devices in a different way than they are now."
 
 	if [[ ${ROOT} == / ]]
 	then
diff --git a/sys-fs/udev/udev-133.ebuild b/sys-fs/udev/udev-133.ebuild
index e022ef2364bb..efc2fbedd7dc 100644
--- a/sys-fs/udev/udev-133.ebuild
+++ b/sys-fs/udev/udev-133.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-133.ebuild,v 1.5 2008/11/25 19:32:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-133.ebuild,v 1.6 2008/11/28 12:51:54 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -301,7 +301,8 @@ fix_old_persistent_net_rules() {
 	local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules
 	[[ -f ${rules} ]] || return
 
-	ebegin "Fixing persistent-net rules file"
+	elog
+	elog "Updating persistent-net rules file"
 
 	# Change ATTRS to ATTR matches, Bug #246927
 	sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
@@ -310,8 +311,6 @@ fix_old_persistent_net_rules() {
 	sed -ri \
 		-e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
 		"${rules}"
-
-	eend 0 ""
 }
 
 # See Bug #129204 for a discussion about restarting udevd
@@ -330,7 +329,6 @@ restart_udevd() {
 
 	elog
 	elog "restarting udevd now."
-	elog
 
 	killall -15 udevd &>/dev/null
 	sleep 1
@@ -340,6 +338,15 @@ restart_udevd() {
 }
 
 pkg_postinst() {
+	fix_old_persistent_net_rules
+
+	restart_udevd
+
+	if [[ $previous_less_than_133 = 0 ]]
+	then
+		enable_udev_init_script
+	fi
+
 	# people want reminders, I'll give them reminders.  Odds are they will
 	# just ignore them anyway...
 
@@ -405,19 +412,14 @@ pkg_postinst() {
 	# requested in Bug #225033:
 	elog
 	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with persistent-net rules,"
+	elog "If you have problems with the persistent-net rules,"
 	elog "just delete the rules file"
 	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then trigger udev by either running"
-	elog "\tudevadm trigger --subsystem-match=net"
-	elog "or by rebooting."
+	elog "and then reboot."
 	elog
-	elog "This may number your devices in a different way than it is now."
-
-	fix_old_persistent_net_rules
-
-	restart_udevd
+	elog "This may however number your devices in a different way than they are now."
 
+	ewarn
 	ewarn "If you build an initramfs including udev, then please"
 	ewarn "make sure that the /sbin/udevadm binary gets included,"
 	ewarn "and your scripts changed to use it,as it replaces the"
@@ -428,11 +430,6 @@ pkg_postinst() {
 	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
 	ewarn "as for other directories."
 
-	if [[ $previous_less_than_133 = 0 ]]
-	then
-		enable_udev_init_script
-	fi
-
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"