From b32c4a6739f0c1eeb1d28253c56f83bed5c63869 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Mon, 21 Mar 2005 14:55:42 +0000
Subject: Factorize code on opening CD tray. This, and the previous change,
 fixed bug #14850.

---
 perl-install/install_any.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ca4d4c26a..650a8d3d8 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -443,7 +443,6 @@ sub selectSupplMedia {
 	    $cdrom =~ m,^/, or $cdrom = "/dev/$cdrom";
 	    devices::make($cdrom);
 	    ejectCdrom($cdrom);
-	    openCdromTray($cdrom);
 	    if ($o->ask_okcancel('', N("Insert the CD"), 1)) {
 		#- mount suppl CD in /mnt/cdrom to avoid umounting /tmp/image
 		mountCdrom("/mnt/cdrom", $cdrom);
@@ -920,10 +919,7 @@ sub ejectCdrom {
     $o_mountpoint and eval { fs::umount($o_mountpoint) };
     $@ and warnAboutFilesStillOpen();
     return if is_xbox();
-    eval { 
-	my $dev = detect_devices::tryOpen($cdrom);
-	ioctl($dev, c::CDROMEJECT(), 1) if ioctl($dev, c::CDROM_DRIVE_STATUS(), 0) == c::CDS_DISC_OK();
-    };
+    openCdromTray($cdrom);
 }
 
 sub warnAboutFilesStillOpen() {
-- 
cgit v1.2.1