diff options
author | Karel Zak | 2012-06-15 12:44:17 +0200 |
---|---|---|
committer | Karel Zak | 2012-06-15 12:44:17 +0200 |
commit | d5f9b6e5fb352c632655e442773df96129cea02d (patch) | |
tree | a260ed26fd77e54280d1370f0b8e7a41aa1fe380 /sys-utils/eject.c | |
parent | libmount: make some string operations more robust (diff) | |
parent | lsblk: use blkdev_scsi_type_to_name() (diff) | |
download | kernel-qcow2-util-linux-d5f9b6e5fb352c632655e442773df96129cea02d.tar.gz kernel-qcow2-util-linux-d5f9b6e5fb352c632655e442773df96129cea02d.tar.xz kernel-qcow2-util-linux-d5f9b6e5fb352c632655e442773df96129cea02d.zip |
Merge branch '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit
* '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit:
lsblk: use blkdev_scsi_type_to_name()
blkdev: add blkdev_scsi_type_to_name()
wipefs: use symbolic value for markup mode
eject: inform if CD-ROM drive is not ready
docs: clean up partx.8 manual
include: fix void pointer arithmetics warnings
sysfs: fix printf format warnings
build: fix unused parameter warnings
build: fix redundant redeclaration warnings
include: fix spurious list.h warnings
uuidd: use output redirection which works [checkbashisms]
blkid: fix realloc memory leak [cppcheck]
setarch: do not use -1 as array index [cppcheck]
Diffstat (limited to 'sys-utils/eject.c')
-rw-r--r-- | sys-utils/eject.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys-utils/eject.c b/sys-utils/eject.c index 096f37090..f621b062e 100644 --- a/sys-utils/eject.c +++ b/sys-utils/eject.c @@ -435,6 +435,14 @@ static void toggle_tray(int fd) if (eject_cdrom(fd)) err(EXIT_FAILURE, _("CD-ROM eject command failed")); return; + case CDS_NO_INFO: + warnx(_("no CD-ROM information available")); + return; + case CDS_DRIVE_NOT_READY: + warnx(_("CD-ROM drive is not ready")); + return; + default: + abort(); } #endif |