SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge rsync://rsync.kernel.org/pub/scm/linux/hotplug/udev

Browse Source
This commit is contained in:
Kay Sievers
2005-08-18 04:48:43 +02:00
parent f7a144a5be a961dcbf0d
commit 5097a6ca42
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/cdrom_id/cdrom_id.c
+4 -7
View File
@@ -107,24 +107,21 @@ int main(int argc, char *argv[])
node = arg;
}
if (!node) {
err("no node specified");
info("no node specified");
rc = 1;
goto exit;
}
fd = open(node, O_RDONLY);
if (fd < 0)
if (errno == ENOMEDIUM)
fd = open(node, O_RDONLY|O_NONBLOCK);
fd = open(node, O_RDONLY|O_NONBLOCK);
if (fd < 0) {
err("unable to open '%s'", node);
info("unable to open '%s'", node);
rc = 1;
goto exit;
}
result = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
if (result < 0) {
err("CDROM_GET_CABILITY failed for '%s'", node);
info("CDROM_GET_CABILITY failed for '%s'", node);
rc = 3;
goto close;
}