rpms/udev/devel udev-rules.patch,1.25,1.26 udev.spec,1.193,1.194
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Nov 10 10:06:17 UTC 2006
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32526
Modified Files:
udev-rules.patch udev.spec
Log Message:
- changed SYSFS to new ATTR rules
- Resolves: rhbz#214898
udev-rules.patch:
50-udev.rules | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- udev-rules.patch 11 Oct 2006 06:49:42 -0000 1.25
+++ udev-rules.patch 10 Nov 2006 10:06:15 -0000 1.26
@@ -1,78 +1,125 @@
---- udev-095/etc/udev/redhat/50-udev.rules.rhrules 2006-07-04 12:34:55.000000000 +0200
-+++ udev-095/etc/udev/redhat/50-udev.rules 2006-10-11 08:45:35.000000000 +0200
-@@ -28,7 +28,8 @@
- KERNEL=="ippp*", NAME="%k", MODE="0660"
- KERNEL=="isdn*", NAME="%k", MODE="0660"
- KERNEL=="isdnctrl*", NAME="%k", MODE="0660"
--KERNEL=="capi*", NAME="%k", MODE="0660"
-+KERNEL=="capi", NAME="capi20", GROUP="uucp", MODE="0660"
-+KERNEL=="capi*", NAME="capi/%n", GROUP="uucp", MODE="0660"
- KERNEL=="dcbri*", NAME="%k", MODE="0660"
- KERNEL=="ircomm*", NAME="%k", GROUP="uucp", MODE="0660"
- KERNEL=="tts/[0-9]*", NAME="%k", GROUP="uucp", MODE="0660"
-@@ -149,16 +150,14 @@
-
- # s390 devices
- KERNEL=="z90crypt", MODE="0666"
-+KERNEL=="slram[0-9]*", SYMLINK+="xpram%n"
-
- # DVB
- KERNEL=="dvb", 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
--#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
--
-+KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device"
-
- # alsa devices
- KERNEL=="controlC[0-9]*", NAME="snd/%k"
-@@ -217,9 +216,6 @@
- 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"
--
- # Section for zaptel device
- KERNEL=="zapctl", NAME="zap/ctl"
- KERNEL=="zaptimer", NAME="zap/timer"
-@@ -229,8 +225,6 @@
+--- udev-103/etc/udev/redhat/50-udev.rules.rhrules 2006-11-10 11:04:04.000000000 +0100
++++ udev-103/etc/udev/redhat/50-udev.rules 2006-11-10 11:04:07.000000000 +0100
+@@ -41,9 +41,9 @@
+ KERNEL=="hvc*", NAME="%k", GROUP="uucp", MODE="0660"
+ KERNEL=="hvsi*", NAME="%k", GROUP="uucp", MODE="0660"
+ KERNEL=="iseries/vtty*", NAME="%k", GROUP="uucp", MODE="0660"
+-KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+-KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+-KERNEL=="ttyUSB*", SYSFS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
++KERNEL=="ttyUSB*", ATTRS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
++KERNEL=="ttyUSB*", ATTRS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
++KERNEL=="ttyUSB*", ATTRS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+
+ # vc devices
+ KERNEL=="vcs", NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+@@ -72,7 +72,7 @@
+ KERNEL=="fd[01]*", GROUP="floppy", MODE="0660"
+ # fix floppy devices
+ KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
+-KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
++KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
+ KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
+
+ # audio devices
+@@ -231,24 +231,24 @@
KERNEL=="pktcdvd", NAME="%k/control"
--
--
- KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
- SYSFS{device/media}=="floppy", \
+-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+- SYSFS{device/media}=="floppy", \
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
++ ATTRS{media}=="floppy", \
SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
-@@ -262,7 +256,7 @@
- SUBSYSTEM!="block", GOTO="persistent_end"
- # skip rules for inappropriate block devices
--KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
-+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*", GOTO="persistent_end"
+-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", ATTRS{media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
+
+-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{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=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{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="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{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"
+-KERNEL=="hd*[0-9]", BUS=="ide", SYSFS{../removable}=="1", \
++KERNEL=="hd*[0-9]", BUS=="ide", ATTRS{removable}=="1", \
+ OPTIONS+="ignore_remove"
+
+
+@@ -265,15 +265,15 @@
+ KERNEL=="ram*|loop*|fd*|nbd*|gnbd*", 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"
-@@ -345,5 +339,8 @@
- ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \
+-BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1", GOTO="persistent_end"
+-BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
++BUS=="ide", DRIVER!="ide-cdrom", ATTRS{removable}=="1", GOTO="persistent_end"
++BUS=="ide", KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
+
+ # by-id (hardware serial number)
+ KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode"
+ KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
+ KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
+
+-KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394"
++KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
+@@ -291,7 +291,7 @@
+ KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
+
+ # by-label/by-uuid (filesystem properties)
+-KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end"
++KERNEL=="*[!0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
+ IMPORT{program}="/lib/udev/vol_id --export $tempnode"
+ ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+@@ -320,29 +320,29 @@
+ # sr: 4 TYPE_WORM, 5 TYPE_ROM
+ # st/osst: 1 TYPE_TAPE
+ # sg: 8 changer, [36] scanner
+-ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="0|7|14", \
++ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="0|7|14", \
+ RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
+-ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="1", \
++ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="1", \
+ RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
+
+
+ ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="/sbin/modprobe sg"
+-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \
+ RUN+="/sbin/modprobe sd_mod"
+-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \
+ RUN+="/sbin/modprobe sr_mod"
+
+-ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \
++ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
+ SYMLINK+="scanner scanner-%k", MODE="0660"
+
+-ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \
++ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", \
+ 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"
+-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
+- SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
+-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
++ ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst"
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
++ ATTRS{model}=="ADR*", RUN+="/sbin/modprobe st"
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \
RUN+="/sbin/modprobe st"
-+# mmc block devices
-+ACTION=="add", SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
-+
- RUN+="socket:/org/kernel/udev/monitor"
-
---- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules 2006-07-04 12:34:55.000000000 +0200
-+++ udev-095/etc/udev/redhat/05-udev-early.rules 2006-10-11 08:45:05.000000000 +0200
-@@ -1,6 +1,7 @@
- # sysfs is populated after the event is sent
- ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
- ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-+ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-
- # ignore these events until someone needs them
- SUBSYSTEM=="drivers", OPTIONS="ignore_device"
+ # mmc block devices
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- udev.spec 10 Nov 2006 09:58:51 -0000 1.193
+++ udev.spec 10 Nov 2006 10:06:15 -0000 1.194
@@ -64,7 +64,7 @@
%prep
%setup -q
%patch1 -p1 -b .rhpermconv
-#%patch2 -p1 -b .rhrules
+%patch2 -p1 -b .rhrules
%patch4 -p1 -b .rhfloppy
%patch5 -p1 -b .rhextras
#%patch6 -p1 -b .pg
More information about the fedora-cvs-commits
mailing list