From aa38a0ad2021991771cd861b5b99d8ba553b5ba6 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 23 Mar 2005 18:30:35 +0000
Subject: Fix ejection of cdrom when asking for the supplementary CD. (bug
 14902)

---
 perl-install/install_any.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a38246aeb..83c490a85 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -912,7 +912,7 @@ sub ejectCdrom {
     if ($o_mountpoint) {
 	$cdrom = $o_cdrom || cat_("/proc/mounts") =~ m!(/dev/\S+)\s+(/mnt/cdrom|/tmp/image)! && $1;
     } else {
-	$cdrom = cat_("/proc/mounts") =~ m!(/dev/$o_cdrom)\s+(/mnt/cdrom|/tmp/image)! && $1;
+	$cdrom = cat_("/proc/mounts") =~ m!((?:/dev/)?$o_cdrom)\s+(/mnt/cdrom|/tmp/image)! && $1;
 	$o_mountpoint ||= $cdrom ? $2 || '/tmp/image' : '';
     }
     $cdrom ||= $o_cdrom;
-- 
cgit v1.2.1