rpms/udev/FC-4 udev.rules,1.29,1.30 udev.spec,1.94,1.95
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Feb 21 07:21:59 UTC 2006
- Previous message (by thread): rpms/gnome-power-manager/devel .cvsignore, 1.11, 1.12 gnome-power-manager.spec, 1.24, 1.25 sources, 1.11, 1.12
- Next message (by thread): rpms/NetworkManager/devel .cvsignore, 1.29, 1.30 NetworkManager.spec, 1.89, 1.90 sources, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: harald
Update of /cvs/dist/rpms/udev/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21109
Modified Files:
udev.rules udev.spec
Log Message:
- fixed pktcdvd device nameing (bz #161268)
- fixed dvb permissions (bz #179993)
- fixed pilot symlink creation
- removed last_rule from ttyUSB, ttyS, ttyACM
- conflicts with old module-init-tools
Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-4/udev.rules,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- udev.rules 31 Jan 2006 16:05:27 -0000 1.29
+++ udev.rules 21 Feb 2006 07:21:56 -0000 1.30
@@ -26,13 +26,15 @@
KERNEL=="vc/s*", GROUP="tty", MODE="0660", OPTIONS="last_rule"
# serial+dialup devices
-KERNEL=="ttyS*", GROUP="uucp", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ttyACM*", GROUP="uucp", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ttyUSB*", GROUP="uucp", MODE="0660", OPTIONS="last_rule"
+KERNEL=="ttyS*", GROUP="uucp", MODE="0660"
+KERNEL=="ttyACM*", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", GROUP="uucp", MODE="0660"
KERNEL=="ippp*", MODE="0660"
KERNEL=="isdn*", MODE="0660"
KERNEL=="isdnctrl*", MODE="0660"
-KERNEL=="capi*", MODE="0660"
+SYSFS{dev}=="191:[0-9]*", NAME="capi/%n", MODE="0660"
+SYSFS{dev}=="68:0", NAME="capi20", MODE="0660"
+
KERNEL=="dcbri*", MODE="0660"
KERNEL=="ircomm*", GROUP="uucp", MODE="0660"
KERNEL=="tts/[0-9]*", GROUP="uucp", MODE="0660"
@@ -80,14 +82,17 @@
KERNEL=="sndstat", MODE="0660"
# pilot/palm devices
-KERNEL=="pilot", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
+KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
# lp devices
+BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k"
KERNEL=="lp*", GROUP="lp", MODE="0660"
KERNEL=="parport*", GROUP="lp", MODE="0660"
KERNEL=="irlpt*", GROUP="lp", MODE="0660"
KERNEL=="usblp*", GROUP="lp", MODE="0660"
KERNEL=="usb/lp*", GROUP="lp", MODE="0660"
+KERNEL=="lp[0-9]*", SYMLINK+="par%n"
# tape devices
KERNEL=="ht*", GROUP="disk", MODE="0660"
@@ -142,9 +147,9 @@
KERNEL=="z90crypt", MODE="0666"
# DVB
-KERNEL=="dvb/*", MODE="0660"
-KERNEL=="dvb", MODE="0660"
-KERNEL=="dvb/adapter*", MODE="0660"
+# 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
@@ -175,9 +180,6 @@
KERNEL=="raw[0-9]*", NAME="raw/%k"
-KERNEL=="lp[0-9]*", SYMLINK+="par%n"
-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"
@@ -221,28 +223,54 @@
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"
-
-# do not seperate the next 2 lines!!
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
+KERNEL="pktcdvd", NAME="%k/control"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
+BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+# workaround for devices which do not report media changes
+BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
+ ENV{ID_MODEL}=="IOMEGA_ZIP*", \
+ NAME{ignore_remove, all_partitions}="%k", \
+ GOTO="check_media_end"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
+# do not seperate the next 2 lines!!
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+ PROGRAM=="/etc/udev/scripts/ide-media.sh %k", \
+ RESULT=="floppy", SYMLINK+="floppy%e", \
+ NAME{ignore_remove, all_partitions}="%k", \
+ GOTO="check_media_end"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+ RESULT=="cdrom", SYMLINK+="cdrom%e"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+ PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+
+KERNEL=="sr[0-9]*", BUS=="scsi", \
+ PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+ PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", \
+ SYMLINK+="cdwriter%e"
+
+KERNEL=="sr[0-9]*", BUS=="scsi", \
+ PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", \
+ SYMLINK+="cdwriter%e"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+ PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", \
+ SYMLINK+="dvdwriter%e"
+
+KERNEL=="sr[0-9]*", BUS=="scsi", \
+ PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD-R", \
+ SYMLINK+="dvdwriter%e"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
+LABEL="check_media_end"
# 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=="dvb*", PROGRAM=="/etc/udev/scripts/dvb.sh %k", NAME="%c"
-
#######################################
# Persistent block device stuff - begin
#######################################
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-4/udev.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- udev.spec 31 Jan 2006 16:05:27 -0000 1.94
+++ udev.spec 21 Feb 2006 07:21:56 -0000 1.95
@@ -5,11 +5,12 @@
Summary: A userspace implementation of devfs
Name: udev
Version: 071
-Release: 0.FC4.2
+Release: 0.FC4.3
License: GPL
Group: System Environment/Base
Provides: udev-persistent = 0:%{version}-%{release}
Obsoletes: udev-persistent < 0:030-5
+Conflicts: module-init-tools < 0:3.2-0.pre9.0.FC4.2
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
Source1: udev.rules
Source3: udev.conf
@@ -266,6 +267,13 @@
%attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
%changelog
+* Tue Feb 21 2006 Harald Hoyer <harald at redhat.com> - 071-0.FC4.3
+- fixed pktcdvd device nameing (bz #161268)
+- fixed dvb permissions (bz #179993)
+- fixed pilot symlink creation
+- removed last_rule from ttyUSB, ttyS, ttyACM
+- conflicts with old module-init-tools
+
* Tue Jan 31 2006 Harald Hoyer <harald at redhat.com> - 071-0.FC4.2
- removed firmware_helper rule, which conflicts with hotplug firmware helper
- Previous message (by thread): rpms/gnome-power-manager/devel .cvsignore, 1.11, 1.12 gnome-power-manager.spec, 1.24, 1.25 sources, 1.11, 1.12
- Next message (by thread): rpms/NetworkManager/devel .cvsignore, 1.29, 1.30 NetworkManager.spec, 1.89, 1.90 sources, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list