From c3c9f723fcfe33c5dcf7efa57ab4fb5db4ade055 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 7 Apr 2009 10:16:48 +0000
Subject: (adjust_paths_in_urpmi_cfg) fix mount point for CD-ROM media (#49613)
 (prefix can be either /tmp/image for main media or real mount point)

(regression introduced in r255093 on 2009-03-30: "(get_media) always trust
stage1's /tmp/image (thus fixing ISO on NFS installation as well as NFS
installation from cooker/ instead of eg cooker/i586 (#48874)")
---
 perl-install/install/NEWS     | 2 ++
 perl-install/install/media.pm | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index aae740060..14a536ed1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix mount point for CD-ROM media (#49613)
+
 Version 12.25 - 06 April 2009
 
 - media management:
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index bed27116d..0de5f9eef 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -530,7 +530,8 @@ sub adjust_paths_in_urpmi_cfg {
         my $dir = _get_medium_dir($phys_m);
         my $old_url = $medium->{url};
         if ($phys_m->{method} eq 'cdrom') {
-            $medium->{url} =~ s!^$phys_m->{real_mntpoint}/!cdrom://!;
+            $medium->{url} =~ s!^/tmp/image!cdrom://!; # main media
+            $medium->{url} =~ s!^$phys_m->{real_mntpoint}/!cdrom://!; # supplementary medium
         } elsif ($phys_m->{method} eq 'nfs') {
             $medium->{url} =~ s!^$::prefix!!;
         }
-- 
cgit v1.2.1