rpms/udev/devel udev.rules,1.39,1.40 udev.spec,1.112,1.113

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	udev.rules udev.spec 
Log Message:
added edd_id


Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- udev.rules	30 Sep 2005 12:23:22 -0000	1.39
+++ udev.rules	6 Oct 2005 07:19:33 -0000	1.40
@@ -282,6 +282,12 @@
 KERNEL=="*[0-9]", IMPORT="/sbin/vol_id --export $tempnode"
 KERNEL=="*[0-9]", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
 KERNEL=="*[0-9]", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+
+KERNEL=="[sh]d*[!0-9]", ACTION=="add", IMPORT="/sbin/edd_id --export $tempnode", SYMLINK+="disk/by-edd
+-id/$env{ID_EDD}"
+KERNEL=="[sh]d*[0-9]", ACTION=="add", IMPORT{parent}=="ID_EDD", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-e
+dd-id/$env{ID_EDD}-part%n"
+
 LABEL="no_volume_id"
 
 LABEL="persistent_end"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- udev.spec	30 Sep 2005 12:23:22 -0000	1.112
+++ udev.spec	6 Oct 2005 07:19:33 -0000	1.113
@@ -7,7 +7,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 069
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 %if !%{with_persistent}
@@ -94,13 +94,14 @@
 	STRIP="/bin/true"  \
 	udevdir="/dev" \
 	USE_LOG=false DEBUG=%{debug} \
-	EXTRAS="extras/scsi_id extras/ata_id \
+	EXTRAS="extras/scsi_id extras/ata_id extras/edd_id \
 	" all
 
 mv udev udev.static
 mv udevstart udevstart.static
 mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
 mv extras/ata_id/ata_id extras/ata_id/ata_id.static
+mv extras/edd_id/edd_id extras/edd_id/edd_id.static
 make clean
 
 make CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
@@ -114,6 +115,7 @@
         extras/scsi_id  \
         extras/ata_id \
 	extras/usb_id \
+	extras/edd_id \
 	extras/volume_id \
 %ifarch s390 s390x
 	extras/dasd_id \
@@ -134,6 +136,7 @@
 	extras/scsi_id	\
         extras/ata_id \
 	extras/usb_id \
+	extras/edd_id \
 	extras/volume_id \
 %ifarch s390 s390x
 	extras/dasd_id \
@@ -159,6 +162,7 @@
 install -m 0755 udevstart.static $RPM_BUILD_ROOT/sbin/udevstart.static
 install -m 0755 extras/scsi_id/scsi_id.static $RPM_BUILD_ROOT/sbin/scsi_id.static
 install -m 0755 extras/ata_id/ata_id.static $RPM_BUILD_ROOT/sbin/ata_id.static
+install -m 0755 extras/edd_id/edd_id.static $RPM_BUILD_ROOT/sbin/edd_id.static
 
 %if %{with_persistent}
 #persistent
@@ -245,6 +249,8 @@
 %attr(755,root,root) /sbin/scsi_id.static
 %attr(755,root,root) /sbin/ata_id
 %attr(755,root,root) /sbin/ata_id.static
+%attr(755,root,root) /sbin/edd_id
+%attr(755,root,root) /sbin/edd_id.static
 %attr(755,root,root) /sbin/usb_id
 %attr(755,root,root) /sbin/vol_id
 %attr(755,root,root) /sbin/path_id
@@ -304,6 +310,9 @@
 %endif
 
 %changelog
+* Thu Oct 06 2005 Harald Hoyer <harald at redhat.com> - 069-7
+- added edd_id
+
 * Fri Sep 30 2005 Harald Hoyer <harald at redhat.com> - 069-6
 - special handling of IEEE1394 firewire devices (bug #168093)