diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-04-23 11:55:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-23 11:55:15 +0000 |
| commit | 9c6965a0287bb49f326994b995c867e389a2cf46 (patch) | |
| tree | 5fbaa10e9516f4b687d269be73c6a941ee4c1c2d | |
| parent | 41d0ac7a42e354ebd0150eb5a85bfafef39e8486 (diff) | |
| download | drakx-backup-do-not-use-9c6965a0287bb49f326994b995c867e389a2cf46.tar drakx-backup-do-not-use-9c6965a0287bb49f326994b995c867e389a2cf46.tar.gz drakx-backup-do-not-use-9c6965a0287bb49f326994b995c867e389a2cf46.tar.bz2 drakx-backup-do-not-use-9c6965a0287bb49f326994b995c867e389a2cf46.tar.xz drakx-backup-do-not-use-9c6965a0287bb49f326994b995c867e389a2cf46.zip | |
(adjust_paths_in_urpmi_cfg) fix cdrom path in urpmi.cfg for dual arch ISOs
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 6ec3827aa..e396bcc06 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix cdrom path in urpmi.cfg for dual arch ISOs - advanced partitionning step: o fix displaying help at install time 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!) { |