rpms/udev/devel udev.rules,1.32,1.33 udev.spec,1.97,1.98

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jul 28 11:44:56 UTC 2005


Author: harald

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

Modified Files:
	udev.rules udev.spec 
Log Message:
changed SYMLINK= to SYMLINK+=


Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- udev.rules	22 Jul 2005 20:40:55 -0000	1.32
+++ udev.rules	28 Jul 2005 11:44:53 -0000	1.33
@@ -144,7 +144,7 @@
 
 # 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]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
 
 # DRI devices always go into a subdirectory (as per the LSB spec)
 KERNEL=="card*",		NAME="dri/card%n"
@@ -166,42 +166,42 @@
 
 KERNEL=="raw[0-9]*",		NAME="raw/%k"
 
-KERNEL=="lp[0-9]*",		SYMLINK="par%n"
+KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
 BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
 
 KERNEL=="microcode",		NAME="cpu/%k"
 # provide symlinks for backwards compatibility
-KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr", SYMLINK="cpu/%k"
-KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpu", SYMLINK="cpu/%k", SYMLINK="%k"
+KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr", SYMLINK+="cpu/%k"
+KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpu", SYMLINK+="cpu/%k", SYMLINK+="%k"
 
-KERNEL=="ram1",			SYMLINK="ram"
-KERNEL=="video0",		SYMLINK="video"
-KERNEL=="radio0",		SYMLINK="radio"
-KERNEL=="audio0",		SYMLINK="audio"
-KERNEL=="dsp0",			SYMLINK="dsp"
-KERNEL=="fb0",			SYMLINK="fb"
-KERNEL=="qft0",			SYMLINK="ftape"
-KERNEL=="isdnctrl0",		SYMLINK="isdnctrl"
-KERNEL=="mixer0",		SYMLINK="mixer"
-KERNEL=="ram0",			SYMLINK="ramdisk"
-KERNEL=="sbpcd0",		SYMLINK="sbpcd"
-KERNEL=="radio0",		SYMLINK="radio"
-KERNEL=="tty0",			SYMLINK="systty"
-KERNEL=="vbi0",			SYMLINK="vbi"
-KERNEL=="null",			SYMLINK="XOR"
+KERNEL=="ram1",			SYMLINK+="ram"
+KERNEL=="video0",		SYMLINK+="video"
+KERNEL=="radio0",		SYMLINK+="radio"
+KERNEL=="audio0",		SYMLINK+="audio"
+KERNEL=="dsp0",			SYMLINK+="dsp"
+KERNEL=="fb0",			SYMLINK+="fb"
+KERNEL=="qft0",			SYMLINK+="ftape"
+KERNEL=="isdnctrl0",		SYMLINK+="isdnctrl"
+KERNEL=="mixer0",		SYMLINK+="mixer"
+KERNEL=="ram0",			SYMLINK+="ramdisk"
+KERNEL=="sbpcd0",		SYMLINK+="sbpcd"
+KERNEL=="radio0",		SYMLINK+="radio"
+KERNEL=="tty0",			SYMLINK+="systty"
+KERNEL=="vbi0",			SYMLINK+="vbi"
+KERNEL=="null",			SYMLINK+="XOR"
 
 KERNEL=="tun",			NAME="net/%k"
 
 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"
-KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK="tape%e"
-KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK="scanner%e", MODE="0660"
+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=="umad*", 		NAME="infiniband/%k"
 KERNEL=="issm*", 		NAME="infiniband/%k"
@@ -214,18 +214,18 @@
 KERNEL=="zap[0-9]*",  		NAME="zap/%n"
 
 # 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=="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=="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=="/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 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 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"
 
 # rename sr* to scd*
 KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- udev.spec	25 Jul 2005 03:05:27 -0000	1.97
+++ udev.spec	28 Jul 2005 11:44:53 -0000	1.98
@@ -7,7 +7,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 063
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 %if !%{with_persistent}
@@ -289,6 +289,9 @@
 %endif
 
 %changelog
+* Thu Jul 28 2005 Harald Hoyer <harald at redhat.com> - 063-3
+- changed "SYMLINK=" to "SYMLINK+="
+
 * Sun Jul 24 2005 Bill Nottingham <notting at redhat.com> - 063-2
 - don't set SEQNUM for scsi replay events (#163729)
 




More information about the fedora-cvs-commits mailing list