rpms/udev/devel udev-rules.patch,1.6,1.7 udev.spec,1.156,1.157

[fedora-cvs-commits redhat com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13477

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
*docs*
- Enumeration for cdrom, floppy, scanner, changer is gone (no more /dev/cdrom1).
  udev now creates one device (cdrom, floppy, scanner, changer) for 
  compatibility (random device wins) and e.g. for cdrom:
       e.g. /dev/cdrom -> hdd
            /dev/cdrom-hdc -> hdc
            /dev/cdrom-hdd -> hdd



udev-rules.patch:
 05-udev-early.rules  |    9 ++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 +++
 udev.rules           |  166 ++++++++++++++++++++++++++++-----------------------
 4 files changed, 113 insertions(+), 76 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- udev-rules.patch	1 Mar 2006 16:31:25 -0000	1.6
+++ udev-rules.patch	1 Mar 2006 17:09:12 -0000	1.7
@@ -36,7 +36,7 @@
 +
 +ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
 --- udev-084/etc/udev/redhat/udev.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/udev.rules	2006-03-01 17:18:34.000000000 +0100
++++ udev-084/etc/udev/redhat/udev.rules	2006-03-01 17:49:38.000000000 +0100
 @@ -3,47 +3,52 @@
  #
  # default is OWNER="root" GROUP="root", MODE="0600"
@@ -171,9 +171,9 @@
 -KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
 -KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
 -KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660"
-+KERNEL=="sr[0-9]*",		SYMLINK+="cdrom-%k"
-+KERNEL=="scd[0-9]*",		SYMLINK+="cdrom-%k"
-+KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom-%k"
++KERNEL=="sr[0-9]*",		SYMLINK+="cdrom cdrom-%k"
++KERNEL=="scd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
++KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
 +KERNEL=="fd[0-9]*",		SYMLINK+="floppy-%k"
 +KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
 +KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
@@ -193,25 +193,25 @@
 -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
 +KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
 +	SYSFS{device/media}=="floppy", \
-+	SYMLINK+="floppy-%k", OPTIONS+="ignore_remove, all_partitions"
++	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
  
 -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CDROM", SYMLINK+="cdrom-%k"
++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CDROM", SYMLINK+="cdrom cdrom-%k"
  
 -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
 -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd-%k"
++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
  
 -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
 -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter-%k cdrw-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter-%k cdrw-%k"
++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
  
 -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
 -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter-%k dvdrw-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter-%k dvdrw-%k"
++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
  
  # rename sr* to scd*
  KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
@@ -279,10 +279,10 @@
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
 +
 +ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \
-+	SYMLINK+="scanner-%k", MODE="0660"
++	SYMLINK+="scanner scanner-%k", MODE="0660"
 +
 +ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \
-+	SYMLINK+="changer-%k", MODE="0660", GROUP="disk"
++	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
 +
 +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
  	SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- udev.spec	1 Mar 2006 16:31:25 -0000	1.156
+++ udev.spec	1 Mar 2006 17:09:15 -0000	1.157
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -283,6 +283,13 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Wed Mar 01 2006 Harald Hoyer <harald redhat com> - 084-9
+- create non-enum device (cdrom, floppy, scanner, changer)
+  for compatibility (random device wins)
+	e.g. /dev/cdrom -> hdd
+	     /dev/cdrom-hdc -> hdc
+             /dev/cdrom-hdd -> hdd
+
 * Wed Mar 01 2006 Harald Hoyer <harald redhat com> - 084-8
 - fixed ZIP drive thrashing (bz #181041 #182601)
 - fixed enumeration (%%e does not work anymore) (bz #183288)