diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-12 21:29:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-12 21:29:21 +0000 |
| commit | edf19549e71889e8374d45e57ab0bea32ad446a1 (patch) | |
| tree | 9f5892a68ca1a856d97979883e61230af9db2adb | |
| parent | ab41a0caaae0bd15dfa2a7f4b3402f3fd25f7b1e (diff) | |
| download | drakx-edf19549e71889e8374d45e57ab0bea32ad446a1.tar drakx-edf19549e71889e8374d45e57ab0bea32ad446a1.tar.gz drakx-edf19549e71889e8374d45e57ab0bea32ad446a1.tar.bz2 drakx-edf19549e71889e8374d45e57ab0bea32ad446a1.tar.xz drakx-edf19549e71889e8374d45e57ab0bea32ad446a1.zip | |
display error when the kernel mismatch the modules
| -rw-r--r-- | perl-install/install2.pm | 5 | ||||
| -rw-r--r-- | perl-install/modules.pm | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index c0c929a6f..feb95374f 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -110,6 +110,11 @@ sub selectMouse { #------------------------------------------------------------------------------ sub setupSCSI { my ($clicked, $ent_number, $auto) = @_; + + if (!$::live && !$o->{blank}) { + -s modules::cz_file() or die _("Can't access kernel modules corresponding to your kernel (file %s is missing)", modules::cz_file()); + } + installStepsCall($o, $auto, 'setupSCSI', $clicked); } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 8850147e2..a70fbd200 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -571,9 +571,13 @@ sub unload { } } +sub cz_file { + "/lib/modules" . (arch() eq 'sparc64' && "64") . ".cz-" . c::kernel_version(); +} + sub load_raw { my @l = map { my ($i, @i) = @$_; [ $i, \@i ] } grep { $_->[0] !~ /ignore/ } @_; - my $cz = "/lib/modules" . (arch() eq 'sparc64' && "64") . ".cz-" . c::kernel_version(); + my $cz = cz_file(); if (!-e $cz) { unlink $_ foreach glob_("/lib/modules*.cz*"); require install_any; |