From: Harald Hoyer <harald@redhat.com>
Date: Wed, 11 Aug 2010 13:20:31 +0000 (+0200)
Subject: cdrom_id: READ TOC before READ DISC INFORMATION fixes qemu
X-Git-Tag: 174~376
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b3b6c2df7d84b620e1168ea4dfe96cca5ec5f8e;p=systemd

cdrom_id: READ TOC before READ DISC INFORMATION fixes qemu
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 5086bfa6..889b2342 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -868,14 +868,14 @@ int main(int argc, char *argv[])
 	if (cd_profiles(udev, fd) < 0)
 		goto print;
 
-	/* get writable media state */
-	if (cd_media_info(udev, fd) < 0)
-		goto print;
-
 	/* get session/track info */
 	if (cd_media_toc(udev, fd) < 0)
 		goto print;
 
+	/* get writable media state */
+	if (cd_media_info(udev, fd) < 0)
+		goto print;
+
 print:
 	printf("ID_CDROM=1\n");
 	if (cd_cd_rom)