diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-10-01 17:45:17 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-10-01 17:45:17 +0000 |
| commit | 7b7276b2651e5cefd3598a8824c9976d485fc745 (patch) | |
| tree | de771c791063a74e006c8ba3671a343f3bce9f73 | |
| parent | 7887c1a607f4ff78974ca61439e0fdc673a4bbec (diff) | |
| download | drakx-7b7276b2651e5cefd3598a8824c9976d485fc745.tar drakx-7b7276b2651e5cefd3598a8824c9976d485fc745.tar.gz drakx-7b7276b2651e5cefd3598a8824c9976d485fc745.tar.bz2 drakx-7b7276b2651e5cefd3598a8824c9976d485fc745.tar.xz drakx-7b7276b2651e5cefd3598a8824c9976d485fc745.zip | |
use $boot_medium for default medium in oem install, avoid using kernel22 or
kernel-enterprise in oem install (space available is too tight on CD oem version).
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index bf40b9162..ba088f414 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -189,7 +189,7 @@ sub setup_postinstall_rpms($$) { #- the complete filename of each package. #- copy the package files in the postinstall RPMS directory. #- last arg is default medium '' known as the CD#1. - pkgs::extractHeaders($prefix, \@toCopy, $packages->{mediums}{1}); + pkgs::extractHeaders($prefix, \@toCopy, $packages->{mediums}{$boot_medium}); cp_af((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms); log::l("copying Auto Install Floppy"); @@ -332,8 +332,8 @@ sub setPackages { push @{$o->{default_packages}}, "nfs-utils-clients" if $o->{method} eq "nfs"; push @{$o->{default_packages}}, "numlock" if $o->{miscellaneous}{numlock}; - push @{$o->{default_packages}}, "kernel-enterprise" if (availableRamMB() > 800) && (arch() !~ /ia64/); - push @{$o->{default_packages}}, "kernel22" if c::kernel_version() =~ /^\Q2.2/; + push @{$o->{default_packages}}, "kernel-enterprise" if !$::oem && (availableRamMB() > 800) && (arch() !~ /ia64/); + push @{$o->{default_packages}}, "kernel22" if !$::oem && c::kernel_version() =~ /^\Q2.2/; push @{$o->{default_packages}}, "kernel-smp" if detect_devices::hasSMP(); push @{$o->{default_packages}}, "kernel-pcmcia-cs" if $o->{pcmcia}; push @{$o->{default_packages}}, "raidtools" if !is_empty_array_ref($o->{all_hds}{raids}); |