summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-11-26 20:37:43 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-11-26 20:37:43 +0000
commitf2afb878f29cb7e38d3ec5ad368cea9d2c3684d3 (patch)
tree733e91a82140e6cb8ed194883ea77f0d71ecdcd1
parent0f606ace7482ae37b1a14f940a8597c13577fb48 (diff)
downloaddrakx-f2afb878f29cb7e38d3ec5ad368cea9d2c3684d3.tar
drakx-f2afb878f29cb7e38d3ec5ad368cea9d2c3684d3.tar.gz
drakx-f2afb878f29cb7e38d3ec5ad368cea9d2c3684d3.tar.bz2
drakx-f2afb878f29cb7e38d3ec5ad368cea9d2c3684d3.tar.xz
drakx-f2afb878f29cb7e38d3ec5ad368cea9d2c3684d3.zip
Only all.img is currently used on x86-64, ia64 and ppc. Therefore, don't
complain nor try to stat some cdrom.img on first CD.
-rw-r--r--perl-install/install_any.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 9886aedfb..a555240a1 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -776,6 +776,7 @@ sub getAndSaveInstallFloppy {
cp_af("$postinstall_rpms/auto_install.img", $where);
} else {
my $image = cat_("/proc/cmdline") =~ /pcmcia/ ? "pcmcia" :
+ arch() =~ /ia64|x86_64|ppc/ ? "all" : #- we only use all.img there
${{ 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;