From: Martin Pitt Date: Thu, 15 Apr 2010 19:25:57 +0000 (+0200) Subject: cdrom_id: Swap media state and TOC info probing X-Git-Tag: 174~548 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=30e3b1a0d3a3ec76f16736470dc656744848d941;hp=58e178894bfc040834e1270c6fe9b9fdef513550 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. --- diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c index 37212e979..722b8f8f4 100644 --- a/extras/cdrom_id/cdrom_id.c +++ b/extras/cdrom_id/cdrom_id.c @@ -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)