summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-26 15:47:25 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-26 15:47:25 +0000
commitb0099e000774015ada2754b5cac2c6aba09929b9 (patch)
treeac7d5e8b6d1c34db00391ab3e93e404bdd7d8672 /perl-install
parente1e9c1f1147632f77b842087e4245e9e6e5a84d0 (diff)
downloaddrakx-b0099e000774015ada2754b5cac2c6aba09929b9.tar
drakx-b0099e000774015ada2754b5cac2c6aba09929b9.tar.gz
drakx-b0099e000774015ada2754b5cac2c6aba09929b9.tar.bz2
drakx-b0099e000774015ada2754b5cac2c6aba09929b9.tar.xz
drakx-b0099e000774015ada2754b5cac2c6aba09929b9.zip
moved hdInstallPath to any.pm.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 220986363..4d524c86e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -548,24 +548,18 @@ sub setupFB {
1;
}
-sub hdInstallPath() {
- my $tail = first(readlink("/tmp/image") =~ m|^/tmp/hdimage/(.*)|);
- my $head = first(readlink("/tmp/hdimage") =~ m|$::prefix(.*)|);
- $tail && ($head ? "$head/$tail" : "/mnt/hd/$tail");
-}
-
sub install_urpmi {
my ($prefix, $method, $packages, $mediums) = @_;
#- rare case where urpmi cannot be installed (no hd install path).
- $method eq 'disk' && !hdInstallPath() and return;
+ $method eq 'disk' && !any::hdInstallPath() and return;
my @cfg;
foreach (sort { $a->{medium} <=> $b->{medium} } values %$mediums) {
my $name = $_->{fakemedium};
if ($_->{ignored} || $_->{selected}) {
my $dir = ($_->{prefix} || ${{ nfs => "file://mnt/nfs",
- disk => "file:/" . hdInstallPath(),
+ disk => "file:/" . any::hdInstallPath(),
ftp => $ENV{URLPREFIX},
http => $ENV{URLPREFIX},
cdrom => "removable://mnt/cdrom" }}{$method} ||