summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 16:20:03 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 16:20:03 +0000
commitf60034b0a86e41a33a89b08af6b302f39d48be72 (patch)
tree18fb5134d4c2fbbebc692eb84e0b2cf52d178123
parent334e1b3b709e3585f6774b6cb46f2e4c32202c1e (diff)
downloaddrakx-f60034b0a86e41a33a89b08af6b302f39d48be72.tar
drakx-f60034b0a86e41a33a89b08af6b302f39d48be72.tar.gz
drakx-f60034b0a86e41a33a89b08af6b302f39d48be72.tar.bz2
drakx-f60034b0a86e41a33a89b08af6b302f39d48be72.tar.xz
drakx-f60034b0a86e41a33a89b08af6b302f39d48be72.zip
- Don't care about BIGMEM stuff for IA-64 & AMD64
- Handle platforms that are only aware of all.img
-rw-r--r--perl-install/install_any.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 9164b4415..a79cd828f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -352,7 +352,7 @@ sub setDefaultPackages {
$o->{compssUsersChoice}{USB} = 1 if modules::get_probeall("usb-interface");
$o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();
$o->{compssUsersChoice}{HIGH_SECURITY} = 1 if $o->{security} > 3;
- $o->{compssUsersChoice}{BIGMEM} = 1 if !$::oem && availableRamMB() > 800 && arch() !~ /ia64/;
+ $o->{compssUsersChoice}{BIGMEM} = 1 if !$::oem && availableRamMB() > 800 && arch() !~ /ia64|x86_64/;
$o->{compssUsersChoice}{SMP} = 1 if detect_devices::hasSMP();
$o->{compssUsersChoice}{CDCOM} = 1 if any { $_->{descr} =~ /commercial/i } values %{$o->{packages}{mediums}};
$o->{compssUsersChoice}{'3D'} = 1 if
@@ -683,6 +683,7 @@ sub getAndSaveInstallFloppy {
cp_af("$postinstall_rpms/auto_install.img", $where);
} else {
my $image = cat_("/proc/cmdline") =~ /pcmcia/ ? "pcmcia" :
+ arch() =~ /ia64|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;