From 9c6965a0287bb49f326994b995c867e389a2cf46 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 23 Apr 2009 11:55:15 +0000
Subject: (adjust_paths_in_urpmi_cfg) fix cdrom path in urpmi.cfg for dual arch
 ISOs

---
 perl-install/install/media.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'perl-install/install/media.pm')

diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 6732b441e..da8becd7f 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -531,9 +531,7 @@ sub adjust_paths_in_urpmi_cfg {
     foreach my $medium (@{$urpm->{media}}) {
         my $phys_m = $medium->{phys_medium};
         if ($phys_m->{method} eq 'cdrom') {
-            $medium->{url} =~ s!^/tmp/image!cdrom://!; # main media
-            my $mnt_point = $phys_m->{real_mntpoint} || "$::prefix$phys_m->{mntpoint}";
-            $medium->{url} =~ s!^$mnt_point/!cdrom://!; # supplementary medium
+            $medium->{url} =~ s!^.*?/media/!$phys_m->{url}/!;
         } elsif (member($phys_m->{method}, qw(disk nfs))) {
             # use the real mount point:
             if ($medium->{url} =~ m!/tmp/image!) {
-- 
cgit v1.2.1