From: David Zeuthen <davidz@redhat.com>
Date: Tue, 10 Nov 2009 17:32:38 +0000 (-0500)
Subject: cdrom_id: Still check profiles even if there is no media
X-Git-Tag: 174~721
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7505831b7ee7b04d84424d2ed306a76abd32871c;p=thirdparty%2Fsystemd.git

cdrom_id: Still check profiles even if there is no media

Even when there is no medium in the drive, we should still check the
profiles supported by the drive. Otherwise we fail to detect things
like Blu-ray drives. See

 https://bugzilla.gnome.org/show_bug.cgi?id=600273

for more information.

Signed-off-by: David Zeuthen <davidz@redhat.com>
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 6ea763b415b..2380b158a07 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -583,9 +583,9 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	/* check for media */
-	if (cd_media_compat(udev, fd) < 0)
-		goto print;
+	/* check for media - don't bail if there's no media as we still need to
+         * to read profiles */
+	cd_media_compat(udev, fd);
 
 	/* check if drive talks MMC */
 	if (cd_inquiry(udev, fd) < 0)