diff options
author | Thierry Vignaud <tv@mandriva.org> | 2009-04-08 15:11:19 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-08 15:11:19 +0000 |
commit | 2767881ae75b51cdf857f2e68a2d1cdde9c3db7c (patch) | |
tree | 64d38a8f02f7a3f1f6540973b6639abbcbc6af13 | |
parent | 099347f5ca7728915eca230c3f7cd83a1216e399 (diff) | |
download | drakx-backup-do-not-use-2767881ae75b51cdf857f2e68a2d1cdde9c3db7c.tar drakx-backup-do-not-use-2767881ae75b51cdf857f2e68a2d1cdde9c3db7c.tar.gz drakx-backup-do-not-use-2767881ae75b51cdf857f2e68a2d1cdde9c3db7c.tar.bz2 drakx-backup-do-not-use-2767881ae75b51cdf857f2e68a2d1cdde9c3db7c.tar.xz drakx-backup-do-not-use-2767881ae75b51cdf857f2e68a2d1cdde9c3db7c.zip |
(adjust_paths_in_urpmi_cfg) fix adjusting media path for supplementary cdrom
-rw-r--r-- | perl-install/install/media.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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!) { |