summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-01 07:32:56 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-01 07:32:56 +0000
commit6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb (patch)
treea1d897d135e02800c813cb0406a5faac4ae0d528
parent0ada7088a6ff0cf07dab4e87123efe28456aafc6 (diff)
downloaddrakx-6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb.tar
drakx-6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb.tar.gz
drakx-6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb.tar.bz2
drakx-6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb.tar.xz
drakx-6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb.zip
Fix generation of urpmi.cfg when doing a disk install from a live tree
-rw-r--r--perl-install/any.pm3
1 files changed, 2 insertions, 1 deletions
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");
}