rpms/udev/F-11 udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch, NONE, 1.1 udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch, NONE, 1.1 start_udev, 1.83, 1.84 udev.spec, 1.275, 1.276

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32297

Modified Files:
	start_udev udev.spec 
Added Files:
	udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch 
	udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch 
Log Message:
* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-5
- try to fix audio cdrom problems (bug #513495)


udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch:
 60-cdrom_id.rules |    6 ++++--
 cdrom_id.c        |    6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 16 Apr 2009 22:29:56 +0000 (+0200)
Subject: cdrom_id: add Xen cdrom support
X-Git-Tag: 142~43
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=55d8f5e208396589476583dad8f2a7f2db3e2ef5

cdrom_id: add Xen cdrom support
---

diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules
index 12fbf63..a3e8e3c 100644
--- a/extras/cdrom_id/60-cdrom_id.rules
+++ b/extras/cdrom_id/60-cdrom_id.rules
@@ -1,3 +1,5 @@
-# import optical drive properties
+# do not edit this file, it will be overwritten on update
 
-ACTION=="add|change", KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
+# import optical drive properties
+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \
+  KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]|xvd*", IMPORT{program}="cdrom_id --export $tempnode"
diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 7be0789..c578f12 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -567,10 +567,8 @@ int main(int argc, char *argv[])
 	}
 
 	/* check drive */
-	if (cd_inquiry(udev, fd) < 0) {
-		rc = 2;
-		goto exit;
-	}
+	if (cd_inquiry(udev, fd) < 0)
+		goto print;
 
 	/* read drive and possibly current profile */
 	if (cd_profiles(udev, fd) < 0)

udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch:
 cdrom_id.c |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 23 Apr 2009 13:04:16 +0000 (+0200)
Subject: cdrom_id: skip media tests if CDROM_DRIVE_STATUS != CDS_DISC_OK
X-Git-Tag: 142~26
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5

cdrom_id: skip media tests if CDROM_DRIVE_STATUS != CDS_DISC_OK
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 371d6a2..0d873ae 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -197,6 +197,16 @@ static int cd_capability_compat(struct udev *udev, int fd)
 	return 0;
 }
 
+static int cd_media_compat(struct udev *udev, int fd)
+{
+	if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) {
+		info(udev, "CDROM_DRIVE_STATUS != CDS_DISC_OK\n");
+		return -1;
+	}
+	cd_media = 1;
+	return 0;
+}
+
 static int cd_inquiry(struct udev *udev, int fd) {
 	struct scsi_cmd sc;
 	unsigned char inq[128];
@@ -569,7 +579,11 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	/* check drive */
+	/* check for media */
+	if (cd_media_compat(udev, fd) < 0)
+		goto print;
+
+	/* check if drive talks MMC */
 	if (cd_inquiry(udev, fd) < 0)
 		goto print;
 


Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/start_udev,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- start_udev	14 Jul 2009 10:06:45 -0000	1.83
+++ start_udev	4 Aug 2009 09:26:45 -0000	1.84
@@ -258,14 +258,14 @@ if [ -f "/sys/class/tty/console/uevent" 
 	if strstr "$cmdline" udevtrace; then
 		UDEV_OPTS="$UDEV_OPTS --debug-trace"
 	fi
+
 	if strstr "$cmdline" udevlog; then
 		UDEV_OPTS="$UDEV_OPTS --debug"
 		/sbin/udevd -d $UDEV_OPTS 2>$udev_root/.udev/udev.log
 	else
-		/sbin/udevd -d $UDEV_OPTS $UDEV_REDIR
+		/sbin/udevd -d $UDEV_OPTS 
 	fi
 
-
 	wait
 	ret=$[$ret + $?]
 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/udev.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- udev.spec	14 Jul 2009 10:06:45 -0000	1.275
+++ udev.spec	4 Aug 2009 09:26:45 -0000	1.276
@@ -22,9 +22,11 @@ Patch0: udev.git-f907449eee.patch
 Patch1: udev.git-055e40edc647d8ccfc27c9cd3163ab5dbf63ed6c.patch
 Patch2: udev.git-0c37798916bc87d72f5f1399d9e050307901db84.patch
 Patch3: udev.git-b4fa1b67f86c9555cbb41c57774761730f6b8939.patch
-Patch4: udev.git-d3c8231e738dd286591c1becc2f327ed55ed89d1.patch
-Patch5: udev.git-f58a9099bb2b18f3f683615324a4382b95446305.patch
-Patch6: Prioritize-dmraid-formats-over-md-raid.patch
+Patch4: udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch
+Patch5: udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch
+Patch6: udev.git-d3c8231e738dd286591c1becc2f327ed55ed89d1.patch
+Patch7: udev.git-f58a9099bb2b18f3f683615324a4382b95446305.patch
+Patch8: Prioritize-dmraid-formats-over-md-raid.patch
 
 Patch102: udev-118-sysconf.patch
 
@@ -106,6 +108,8 @@ dynamic library, which provides access t
 %patch4 -p1 
 %patch5 -p1 
 %patch6 -p1 
+%patch7 -p1 
+%patch8 -p1 
 
 %patch102 -p1 -b .sysconf
 
@@ -408,6 +412,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-5
+- try to fix audio cdrom problems (bug #513495)
+
 * Tue Jul 14 2009 Harald Hoyer <harald at redhat.com> 141-5
 - add /dev/fuse to be created by start_udev
 - add "udevlog" kernel command line option to redirect the