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

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r1 i686)

6 files changed, 39 insertions, 44 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/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:"