From 6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 1 Sep 2004 07:32:56 +0000
Subject: Fix generation of urpmi.cfg when doing a disk install from a live
 tree

---
 perl-install/any.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 445f5c02c..62fb11c3b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -73,8 +73,9 @@ sub enableShadow() {
 }
 
 sub hdInstallPath() {
-    my $tail = first(readlink("/tmp/image") =~ m|^/tmp/hdimage/?(.*)|);
+    my $tail = first(readlink("/tmp/image") =~ m|^(?:/tmp/)?hdimage/*(.*)|);
     my $head = first(readlink("/tmp/hdimage") =~ m|$::prefix(.*)|);
+    log::l("search HD install path, tail=$tail, head=$head, tail defined=" . to_bool(defined $tail));
     defined $tail && ($head ? "$head/$tail" : "/mnt/hd/$tail");
 }
 
-- 
cgit v1.2.1