X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=e7a3e40a85e22f8a2cbb3f61a649cb842df26332;hp=0153af66330aeccc7be0248ca6a3656585b4274c;hb=678df8a461c7573bf423a39be383bc7b70d943df;hpb=13e0fca5dff286921a8df0cd737e6e1224e53275

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 0153af663..e7a3e40a8 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -364,8 +364,14 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd)
 	err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
 	if ((err != 0)) {
 		info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
-		info(udev, "no current profile, assuming no media\n");
-		return -1;
+		if (cd_media == 1) {
+			info(udev, "no current profile, but disc is present; assuming CD-ROM\n");
+			cd_media_cd_rom = 1;
+			return 0;
+		} else {
+			info(udev, "no current profile, assuming no media\n");
+			return -1;
+		}
 	};
 
 	cd_media = 1;