From 2767881ae75b51cdf857f2e68a2d1cdde9c3db7c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 8 Apr 2009 15:11:19 +0000 Subject: (adjust_paths_in_urpmi_cfg) fix adjusting media path for supplementary cdrom --- perl-install/install/media.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index e562af605..6732b441e 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -532,7 +532,8 @@ sub adjust_paths_in_urpmi_cfg { my $phys_m = $medium->{phys_medium}; if ($phys_m->{method} eq 'cdrom') { $medium->{url} =~ s!^/tmp/image!cdrom://!; # main media - $medium->{url} =~ s!^$phys_m->{real_mntpoint}/!cdrom://!; # supplementary medium + my $mnt_point = $phys_m->{real_mntpoint} || "$::prefix$phys_m->{mntpoint}"; + $medium->{url} =~ s!^$mnt_point/!cdrom://!; # supplementary medium } elsif (member($phys_m->{method}, qw(disk nfs))) { # use the real mount point: if ($medium->{url} =~ m!/tmp/image!) { -- cgit v1.2.1