picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cdrom_id: Swap media state and TOC info probing 

Blank CDs do not have a TOC, thus will fail cd_media_toc() (at least with the
"Do not ignore errors from scsi_cmd_run()" fix). Thus probe the media state
first, so that we can properly detect blank media.
This commit is contained in:
Martin Pitt 2010-04-15 21:25:57 +02:00
parent 58e178894b
commit 30e3b1a0d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extras/cdrom_id/cdrom_id.c
View File

@ -681,14 +681,14 @@ int main(int argc, char *argv[])
if (cd_profiles(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;
/* get session/track info */
if (cd_media_toc(udev, fd) < 0)
goto print;
print:
printf("ID_CDROM=1\n");
if (cd_cd_rom)