summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-08-21 15:23:06 +0000
committerFrancois Pons <fpons@mandriva.com>2001-08-21 15:23:06 +0000
commitd3476c9ec59cb54edbb74f5103212443db7e3ed2 (patch)
tree2427c7f57b5f20fcf1972f3ec3042baebe35ec7c
parente98ee90ad678ead7fa59697092c9511895be10ce (diff)
downloaddrakx-d3476c9ec59cb54edbb74f5103212443db7e3ed2.tar
drakx-d3476c9ec59cb54edbb74f5103212443db7e3ed2.tar.gz
drakx-d3476c9ec59cb54edbb74f5103212443db7e3ed2.tar.bz2
drakx-d3476c9ec59cb54edbb74f5103212443db7e3ed2.tar.xz
drakx-d3476c9ec59cb54edbb74f5103212443db7e3ed2.zip
fixed hd installation for urpmi.
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 0966f8ee2..29c8a6875 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -518,7 +518,7 @@ sub install_urpmi {
umask $mask;
my $dir = ${{ nfs => "file://mnt/nfs",
- hd => "file:/" . hdInstallPath(),
+ disk => "file:/" . hdInstallPath(),
ftp => $ENV{URLPREFIX},
http => $ENV{URLPREFIX},
cdrom => "removable_cdrom_$::i://mnt/cdrom" }}{$method} . "/$_->{rpmsdir}";
@@ -664,7 +664,7 @@ push @graphical_steps, 'doPartitionDisks', 'formatPartitions';
sub getAndSaveInstallFloppy {
my ($o, $where) = @_;
my $image = cat_("/proc/cmdline") =~ /pcmcia/ ? "pcmcia" :
- ${{ hd => 'hd', cdrom => 'cdrom', ftp => 'network', nfs => 'network', http => 'network' }}{$o->{method}};
+ ${{ disk => 'hd', cdrom => 'cdrom', ftp => 'network', nfs => 'network', http => 'network' }}{$o->{method}};
$image .= arch() =~ /sparc64/ && "64"; #- for sparc64 there are a specific set of image.
getAndSaveFile("images/$image.img", $where) or log::l("failed to write Install Floppy ($image.img) to $where"), return;
1;