shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-24 14:50:17 +03:00
Code

cdrom_id: Fall back to CDROM_DRIVE_STATUS if all MMC commands fail

Browse Source 
Reportedly, some "when I'm grown up I want to be a CD drive" fake USB CD sticks
like the IronKey neither support the SCSI "GET CONFIGURATION" nor the older
(pre-MMC2) "READ DISC INFORMATION" command. In that case, check if
cd_media_compat() detected that there is a disc present, and assume that we
have a CD-ROM medium.
This commit is contained in:
Martin Pitt 2010-10-05 14:59:51 +02:00
parent 13e0fca5df
commit 678df8a461
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extras/cdrom_id/cdrom_id.c
View File

@ -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;