diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-03-23 18:30:35 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-03-23 18:30:35 +0000 |
| commit | aa38a0ad2021991771cd861b5b99d8ba553b5ba6 (patch) | |
| tree | 5361260cd642e9d13481eefd5d5c4cdfca91a823 | |
| parent | 1d9e3e3ad8523b3359115434194ac0bee179726d (diff) | |
| download | drakx-aa38a0ad2021991771cd861b5b99d8ba553b5ba6.tar drakx-aa38a0ad2021991771cd861b5b99d8ba553b5ba6.tar.gz drakx-aa38a0ad2021991771cd861b5b99d8ba553b5ba6.tar.bz2 drakx-aa38a0ad2021991771cd861b5b99d8ba553b5ba6.tar.xz drakx-aa38a0ad2021991771cd861b5b99d8ba553b5ba6.zip | |
Fix ejection of cdrom when asking for the supplementary CD. (bug 14902)
| -rw-r--r-- | perl-install/install_any.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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; |