rpms/udev/devel udev-151-rules.patch, NONE, 1.1 udev-post.init, 1.11, 1.12 udev.spec, 1.299, 1.300 udev-141-cpu-online.patch, 1.1, NONE

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18035

Modified Files:
	udev-post.init udev.spec 
Added Files:
	udev-151-rules.patch 
Removed Files:
	udev-141-cpu-online.patch 
Log Message:
* Wed Jan 27 2010 Harald Hoyer <harald at redhat.com> 151-1
- version 151
- fixed udev-post initscript
- only require s390utils-base, rather than s390utils (#553156)


udev-151-rules.patch:
 40-redhat.rules |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE udev-151-rules.patch ---
diff --git a/rules/redhat/40-redhat.rules b/rules/redhat/40-redhat.rules
index 47ce9e5..aaba82b 100644
--- a/rules/redhat/40-redhat.rules
+++ b/rules/redhat/40-redhat.rules
@@ -5,11 +5,11 @@ KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", SYMLINK+="flo
 
 KERNEL=="fw*", PROGRAM="fw_unit_symlinks.sh %k %n", SYMLINK+="$result"
 
-ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="3|6", SYMLINK+="scanner scanner-%k", MODE="0660"
+ACTION=="add", KERNEL=="sg[0-9]*", SUBSYSTEM=="scsi_device", ATTRS{type}=="3|6", SYMLINK+="scanner scanner-%k", MODE="0660"
 
-ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
+ACTION=="add", KERNEL=="sg[0-9]*", SUBSYSTEM=="scsi_device", ATTRS{type}=="8", SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
 
-BUS=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", 	SYMLINK+="floppy floppy-%k"
+SUBSYSTEM=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", 	SYMLINK+="floppy floppy-%k"
 
 KERNEL=="fd[0-9]*",		SYMLINK+="floppy floppy-%k"
 
@@ -25,3 +25,5 @@ KERNEL=="vcsa[0-9]*",          OWNER="vcsa", GROUP="tty"
 KERNEL=="vcc/*",               OWNER="vcsa", GROUP="tty"
 
 KERNEL=="event*", ATTRS{idVendor}=="03f0", ATTRS{interface}=="Virtual Mouse", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="input/hp_ilo_mouse"
+
+ACTION=="add", KERNEL=="cpu[0-9]*", RUN+="/bin/bash -c 'echo 1 > /sys/devices/system/cpu/%k/online'"


Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- udev-post.init	27 Jan 2010 15:36:52 -0000	1.11
+++ udev-post.init	29 Jan 2010 09:57:03 -0000	1.12
@@ -26,7 +26,7 @@ case "$1" in
 	[ -w /var/lock/subsys ] || exit 4
 	STRING=$"Retrigger failed udev events"
 	echo -n $STRING 
-	/sbin/udevadm trigger --retry-failed
+	/sbin/udevadm trigger --type=failed
 	success "$STRING"
 	echo
 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- udev.spec	27 Jan 2010 15:36:52 -0000	1.299
+++ udev.spec	29 Jan 2010 09:57:03 -0000	1.300
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 151
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -13,7 +13,7 @@ Obsoletes: udev-persistent < 0:030-5
 Obsoletes: udev-extras < 20090618
 Provides: udev-extras = 20090618-1
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-Patch1: udev-141-cpu-online.patch
+Patch1: udev-151-rules.patch
 
 Source1: start_udev
 Source3: udev-post.init
@@ -356,6 +356,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Jan 29 2010 Harald Hoyer <harald at redhat.com> 151-2
+- fixed rules and startup script (#559844)
+
 * Wed Jan 27 2010 Harald Hoyer <harald at redhat.com> 151-1
 - version 151
 - fixed udev-post initscript


--- udev-141-cpu-online.patch DELETED ---