diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-04-07 10:16:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-07 10:16:48 +0000 |
| commit | c3c9f723fcfe33c5dcf7efa57ab4fb5db4ade055 (patch) | |
| tree | 8318fd2cd0157aa81191dd7351cdad89089028d1 /perl-install | |
| parent | b08b21158c4dd6f882d94f850ce578e5d1227b33 (diff) | |
| download | drakx-c3c9f723fcfe33c5dcf7efa57ab4fb5db4ade055.tar drakx-c3c9f723fcfe33c5dcf7efa57ab4fb5db4ade055.tar.gz drakx-c3c9f723fcfe33c5dcf7efa57ab4fb5db4ade055.tar.bz2 drakx-c3c9f723fcfe33c5dcf7efa57ab4fb5db4ade055.tar.xz drakx-c3c9f723fcfe33c5dcf7efa57ab4fb5db4ade055.zip | |
(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)")
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 3 |
2 files changed, 4 insertions, 1 deletions
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!!; } |