[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]
rpms/udev/devel udev-extras.patch, 1.2, 1.3 udev-rules.patch, 1.5, 1.6 udev.spec, 1.155, 1.156

From: fedora-cvs-commits redhat com
To: fedora-cvs-commits redhat com
Subject: rpms/udev/devel udev-extras.patch, 1.2, 1.3 udev-rules.patch, 1.5, 1.6 udev.spec, 1.155, 1.156
Date: Wed, 1 Mar 2006 11:31:45 -0500
Author: harald

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

Modified Files:
	udev-extras.patch udev-rules.patch udev.spec 
Log Message:
- fixed ZIP drive thrashing (bz #181041 #182601)
- fixed enumeration (%e does not work anymore) (bz #183288)


udev-extras.patch:
 check-cdrom.sh            |   39 +++++++++++++++++++++++++++++++++++++++
 load_floppy_module.sh     |   35 +++++++++++++++++++++++++++++++++++
 run_directory/MAKEDEV.dev |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+)

Index: udev-extras.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-extras.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-extras.patch	7 Feb 2006 11:13:42 -0000	1.2
+++ udev-extras.patch	1 Mar 2006 16:31:21 -0000	1.3
@@ -41,16 +41,6 @@
 +    exit 1
 +}
 --- /dev/null	2006-02-07 10:47:25.401206250 +0100
-+++ udev-084/extras/ide-media.sh	2006-02-07 10:58:51.000000000 +0100
-@@ -0,0 +1,7 @@
-+#!/bin/bash 
-+i=0
-+while [[ ! -a /proc/ide/$1/media && $i -lt 10 ]]; do 
-+	/bin/usleep 100000; 
-+	i=$[i+1];
-+done
-+/bin/cat /proc/ide/$1/media
---- /dev/null	2006-02-07 10:47:25.401206250 +0100
 +++ udev-084/extras/run_directory/MAKEDEV.dev	2006-02-07 10:58:51.000000000 +0100
 @@ -0,0 +1,38 @@
 +#!/bin/sh

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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udev-rules.patch	24 Feb 2006 16:14:11 -0000	1.5
+++ udev-rules.patch	1 Mar 2006 16:31:25 -0000	1.6
@@ -36,16 +36,17 @@
 +
 +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-02-24 15:35:26.000000000 +0100
-@@ -3,6 +3,7 @@
++++ udev-084/etc/udev/redhat/udev.rules	2006-03-01 17:18:34.000000000 +0100
+@@ -3,47 +3,52 @@
  #
  # default is OWNER="root" GROUP="root", MODE="0600"
  #
+-KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
 +
- KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
++KERNEL=="*", OWNER="root" GROUP="root", MODE="0600"
  
  # all block devices
-@@ -10,40 +11,44 @@
+ SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
  KERNEL=="root",			GROUP="disk", MODE="0640"
  
  # console devices
@@ -136,82 +137,115 @@
  
  # audio devices
  KERNEL=="dsp*",			MODE="0660"
-@@ -142,9 +153,10 @@
+@@ -142,9 +153,9 @@
  KERNEL=="z90crypt",		MODE="0666"
  
  # DVB
 -KERNEL=="dvb/*",		MODE="0660"
  KERNEL=="dvb",			MODE="0660"
 -KERNEL=="dvb/adapter*",		MODE="0660"
-+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0660"
-+
-+
++SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
++	NAME="%c", MODE="0660"
  
  # create a symlink named after the device map name
  # note devmap_name comes with extras/multipath
-@@ -209,7 +221,7 @@
- KERNEL=="fd[0-9]*",		SYMLINK+="floppy%e"
- KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
- KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
+@@ -179,8 +190,8 @@
+ BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
+ 
+ KERNEL=="microcode",		NAME="cpu/%k"
+-KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr"
+-KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpuid"
++KERNEL=="msr[0-9]*",     	NAME="cpu/%n/msr"
++KERNEL=="cpu[0-9]*",     	NAME="cpu/%n/cpuid"
+ 
+ KERNEL=="ram1",			SYMLINK+="ram"
+ KERNEL=="video0",		SYMLINK+="video"
+@@ -203,13 +214,12 @@
+ KERNEL=="device-mapper",	NAME="mapper/control"
+ 
+ # old compat symlinks with enumeration
+-KERNEL=="sr[0-9]*",		SYMLINK+="cdrom%e"
+-KERNEL=="scd[0-9]*",		SYMLINK+="cdrom%e"
+-KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom%e"
+-KERNEL=="fd[0-9]*",		SYMLINK+="floppy%e"
+-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=="sg[0-9]*", BUS="scsi", SYSFS{type}=="[36]", 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=="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"
  
  KERNEL=="umad*", 		NAME="infiniband/%k"
  KERNEL=="issm*", 		NAME="infiniband/%k"
-@@ -221,27 +233,30 @@
+@@ -221,27 +231,30 @@
  KERNEL=="zappseudo",  		NAME="zap/pseudo"
  KERNEL=="zap[0-9]*",  		NAME="zap/%n"
  
 -BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
-+KERNEL="pktcdvd", NAME="%k/control"
++KERNEL=="pktcdvd", NAME="%k/control"
 +
-+BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK+="scanner%e", MODE="0660"
 +
-+BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="8", SYMLINK+="changer%e", MODE="0660"
  
- # do not seperate the next 2 lines!!
+-# do not seperate the next 2 lines!!
 -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", PROGRAM=="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"
  
- KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
+-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=="/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%e"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="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=="/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%e"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="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="/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%e"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="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"
  
  # rename sr* to scd*
  KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
- KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
+-KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
++KERNEL=="hd*[0-9]", BUS=="ide", SYSFS{../removable}=="1", \
++	OPTIONS+="ignore_remove"
  
 -KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
  
  #######################################
  # Persistent block device stuff - begin
-@@ -297,37 +312,36 @@
+@@ -256,7 +269,8 @@
+ KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
+ 
+ # never access removable ide devices, the drivers are causing event loops on open()
+-BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
++BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1",	GOTO="persistent_end"
++BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
+ 
+ # by-id (hardware serial number)
+ KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
+@@ -297,37 +311,43 @@
  # Persistent block device stuff - end
  #####################################
  
 -ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
-+# workaround for devices which do not report media changes
-+BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
-+        ENV{ID_MODEL}=="IOMEGA_ZIP*",   NAME="%k", OPTIONS+="all_partitions"
++ACTION=="add", SUBSYSTEM=="usb_device", \
++	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
++	NAME="%c", MODE="0644"
  
-+ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
- 
- # Perhaps this should just be for all subsystems?
 +ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias"
  
+-# Perhaps this should just be for all subsystems?
+-
 -ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \
 -	RUN+="/sbin/modprobe $modalias"
 -ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
@@ -226,12 +260,17 @@
 +# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
 +# sr:           4 TYPE_WORM, 5 TYPE_ROM
 +# st/osst:      1 TYPE_TAPE
-+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
-+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
++# sg: 		8 changer, [36] scanner
++ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", \
++	RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
++ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", \
++	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
  
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
 -	RUN+="/sbin/modprobe sd_mod"
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
++
++ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
 +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \
  	RUN+="/sbin/modprobe sd_mod"
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
@@ -239,6 +278,12 @@
  	RUN+="/sbin/modprobe sr_mod"
 -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"
++
++ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \
++	SYMLINK+="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"
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
@@ -249,9 +294,8 @@
  	RUN+="/sbin/modprobe st"
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
 -	RUN+="/sbin/modprobe sg"
-+ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
-+
-+RUN+="socket:/org/kernel/udev/monitor"
  
 -ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
 -        RUN+="/sbin/firmware_helper"
++RUN+="socket:/org/kernel/udev/monitor"
++


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- udev.spec	24 Feb 2006 23:40:51 -0000	1.155
+++ udev.spec	1 Mar 2006 16:31:25 -0000	1.156
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -153,7 +153,7 @@
 
 mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
 
-for i in load_floppy_module.sh check-cdrom.sh ide-media.sh udevpermconv.sh; do
+for i in load_floppy_module.sh check-cdrom.sh udevpermconv.sh; do
 	install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir}
 done
 
@@ -258,7 +258,6 @@
 %attr(0755,root,root) %dir %{_sysconfdir}/dev.d/
 %attr(0755,root,root) %{udev_scriptdir}/MAKEDEV.dev
 %attr(0755,root,root) %{udev_scriptdir}/check-cdrom.sh
-%attr(0755,root,root) %{udev_scriptdir}/ide-media.sh
 %attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
 %attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh
@@ -284,6 +283,10 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* 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)
+
 * Fri Feb 24 2006 Peter Jones <pjones redhat com> - 084-7
 - Don't start udevd in %%post unless it's already running
 - Stop udevd before chkconfig --del in %%preun
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]