From 39949e5ec43a1a5f3bdf5f6de2f1e5e16bc63cfe Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Mar 2008 17:44:07 +0000
Subject: - restore correct configuration of nfs/hd media in urpmi.cfg  
 (regression introduced in 10.8)

---
 perl-install/install/NEWS     | 2 ++
 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});
-- 
cgit v1.2.1