[PATCH] Unlock the CD tray door in isys.ejectcdrom() (#569377)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Since we're leaving the cd drive door locked in loader, we need to make
isys's eject routines unlock the door first, or eject will fail.
---
 isys/isys.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/isys/isys.c b/isys/isys.c
index 75ee2b3..229daab 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -56,6 +56,7 @@
 #include <linux/fb.h>
 #include <libintl.h>
 #include <libgen.h>
+#include <linux/cdrom.h>
 #include <linux/major.h>
 #include <linux/raid/md_u.h>
 #include <linux/raid/md_p.h>
@@ -503,6 +504,11 @@ static PyObject * doEjectCdrom(PyObject * s, PyObject * args) {
 
     if (!PyArg_ParseTuple(args, "i", &fd)) return NULL;
 
+    /* Ask it to unlock the door and then eject the disc. There's really
+     * nothing to do if unlocking doesn't work, so just eject without
+     * worrying about it. -- pjones
+     */
+    ioctl(fd, CDROM_LOCKDOOR, 0);
     if (ioctl(fd, CDROMEJECT, 1)) {
 	PyErr_SetFromErrno(PyExc_SystemError);
 	return NULL;
-- 
1.7.0.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux