diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-05 17:44:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-05 17:44:07 +0000 |
| commit | 39949e5ec43a1a5f3bdf5f6de2f1e5e16bc63cfe (patch) | |
| tree | ee64adfc87f0ee344a071bae15d9274fb9246e1e | |
| parent | 6c9c74919b7b8c6bbcaca8f64b47406d5e8e3704 (diff) | |
| download | drakx-backup-do-not-use-39949e5ec43a1a5f3bdf5f6de2f1e5e16bc63cfe.tar drakx-backup-do-not-use-39949e5ec43a1a5f3bdf5f6de2f1e5e16bc63cfe.tar.gz drakx-backup-do-not-use-39949e5ec43a1a5f3bdf5f6de2f1e5e16bc63cfe.tar.bz2 drakx-backup-do-not-use-39949e5ec43a1a5f3bdf5f6de2f1e5e16bc63cfe.tar.xz drakx-backup-do-not-use-39949e5ec43a1a5f3bdf5f6de2f1e5e16bc63cfe.zip | |
- restore correct configuration of nfs/hd media in urpmi.cfg
(regression introduced in 10.8)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c6c80b566..b23ad3c0b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -2,6 +2,8 @@ (broken because of ntfs-3g switch in previous release) - install kernel586 on Transmeta Crusoe TM5800 (#37866) - do not load i810fb, rely on vesa xorg drive instead (it may help #37772) +- restore correct configuration of nfs/hd media in urpmi.cfg + (regression introduced in 10.8) Version 10.8 - 4 March 2008 diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index 7899f6263..cc3f79ee3 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -948,9 +948,11 @@ sub install_urpmi { my $phys_m = $medium->{phys_medium}; if ($phys_m->{method} eq 'ftp' || $phys_m->{method} eq 'http' || $phys_m->{method} eq 'cdrom') { $dir = $phys_m->{url}; - } elsif ($phys_m->{method} eq 'iso') { + } else { $dir = "$phys_m->{mntpoint}$phys_m->{rel_path}"; - $removable_device = $phys_m->{loopback_device}{mntpoint} . $phys_m->{loopback_file}; + if ($phys_m->{method} eq 'iso') { + $removable_device = $phys_m->{loopback_device}{mntpoint} . $phys_m->{loopback_file}; + } } $dir = MDK::Common::File::concat_symlink($dir, $medium->{rpmsdir}); |