summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-03-23 12:20:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-03-23 12:20:49 +0000
commitb3c0f129bea93d7517820aead34e089a8b8592db (patch)
tree231e5b7e19ba08db2c829c896df088e6d7d9d8d8
parenta0510196840ef299c9942fe2bd6f9d5c13e15964 (diff)
downloaddrakx-b3c0f129bea93d7517820aead34e089a8b8592db.tar
drakx-b3c0f129bea93d7517820aead34e089a8b8592db.tar.gz
drakx-b3c0f129bea93d7517820aead34e089a8b8592db.tar.bz2
drakx-b3c0f129bea93d7517820aead34e089a8b8592db.tar.xz
drakx-b3c0f129bea93d7517820aead34e089a8b8592db.zip
LSB doesn't need kernel 2.4 anymore
-rw-r--r--perl-install/bootloader.pm6
-rw-r--r--perl-install/install_any.pm7
-rw-r--r--perl-install/install_steps_interactive.pm7
3 files changed, 4 insertions, 16 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 9f66ab165..f0c9022f2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -424,7 +424,9 @@ sub dev2prompath { #- SPARC only
$dev;
}
-sub get_kernels_and_labels() {
+sub get_kernels_and_labels {
+ my ($b_prefer_24) = @_;
+
my $dir = "$::prefix/boot";
my @l = grep { /^vmlinuz-/ } all($dir);
my @kernels = grep { ! -l "$dir/$_" } @l;
@@ -441,7 +443,7 @@ sub get_kernels_and_labels() {
{ complete_version => $_, /(.*mdk)(.*)/ ? (ext => $2, version => $1) : (version => $_) };
} @kernels;
- if (-e "$::prefix/usr/lib/lsb") {
+ if ($b_prefer_24) {
my ($kernel_24, $other) = partition { $_->{ext} eq '' && $_->{version} =~ /^\Q2.4/ } @kernels;
@kernels = (@$kernel_24, @$other);
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 862d3711b..c3c2469ab 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -304,13 +304,6 @@ sub setPackages {
pkgs::read_rpmsrate($o->{packages}, getFile("Mandrake/base/rpmsrate"));
($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{meta_class});
- #- set kernel-2.4xxx in group LSB
- foreach (grep { $_->{ext} eq '' && $_->{version} =~ /^\Q2.4/ } pkgs::packages2kernels($o->{packages})) {
- $_->{pkg}->rate and internal_error("package " . $_->{pkg}->name . " should not have a rate");
- $_->{pkg}->set_rate(5);
- $_->{pkg}->set_rflags('LSB');
- }
-
#- preselect default_packages and compssUsersChoices.
setDefaultPackages($o);
pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || next) foreach @{$o->{default_packages}};
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e0cd40286..cdb8def53 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -528,13 +528,6 @@ sub chooseGroups {
$o->reallyChooseGroups($size_to_display, $individual, \%val) or return;
- if ($val{'Development|LSB'}) {
- $o->ask_okcancel('',
-N("Due to incompatibilities of the 2.6 series kernel with the LSB runtime
-tests, the 2.4 series kernel will be installed as the default to insure
-compliance under the \"LSB\" group selection."), 1) or next;
- }
-
last if $::testing || pkgs::correctSize($size / sqr(1024)) < $available_size;
$o->ask_warn('', N("Selected size is larger than available space"));