From d269fc99ca5de9df10c673c00c5d28063340b848 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 25 May 2015 05:33:37 -0400
Subject: fix urpmi media for USB install (mga#5690)

v2: (tv) handle both cases
---
 perl-install/install/NEWS     | 1 +
 perl-install/install/media.pm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5cff2c468..f303dad92 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - die is not an option here (mga#8819)
   o just log the faillure and offer to either retry or abort
+- fix urpmi media when installing from USB (mga#5690)
 - locale setting
   o fix reading back IM config (mga#15761)
 - partitioning:
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 9d75ea24f..d6d30219d 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -532,8 +532,8 @@ sub adjust_paths_in_urpmi_cfg {
             $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!) {
-                $medium->{url} =~ s!/tmp/image!$phys_m->{mntpoint}!;
+            if ($medium->{url} =~ m!/tmp/image(/media)?!) {
+                $medium->{url} =~ s!/tmp/image(/media).!$phys_m->{mntpoint}$phys_m->{rel_path}!;
             } else {
                 # just remove $::prefix and we already have the real mount point:
                 $medium->{url} =~ s!^$::prefix!!;
-- 
cgit v1.2.1