diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-09-01 16:47:01 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-09-01 16:47:01 +0000 |
| commit | 1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2 (patch) | |
| tree | 9d229e9072e70c72613c7cf925304b5e46a06b2b /perl-install/standalone/service_harddrake | |
| parent | 6cd47f9d37f9dd6c66351ecf477335a038481b62 (diff) | |
| download | drakx-1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2.tar drakx-1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2.tar.gz drakx-1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2.tar.bz2 drakx-1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2.tar.xz drakx-1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2.zip | |
service_harddrake: adapt kernel modaliases that are not valid anymore
in modprobe.conf when booting a new kernel, this should fix migration
from e1000 to e1000e and from iwl4965 to iwlagn (#41248)
Diffstat (limited to 'perl-install/standalone/service_harddrake')
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index a9b8fe8d2..fbe854c2b 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -38,7 +38,7 @@ my $modules_conf = modules::any_conf->read; my $isLaptop = detect_devices::isLaptop(); my $curr_kernel = c::kernel_version(); -my ($kernel_major) = $curr_kernel =~ /(^\d+\.\d+).*/; +my ($kernel_major) = $curr_kernel =~ /^(\d+\.\d+)/; my %previous_kernel_config = getVarsFromSh("$hw_sysconfdir/kernel"); setVarsInSh("$hw_sysconfdir/kernel", { KERNEL => $kernel_major, IS_LAPTOP => bool2text($isLaptop) }); @@ -50,6 +50,12 @@ if (!exists $previous_kernel_config{IS_LAPTOP} || $force || $isLaptop != text2bo harddrake::autoconf::laptop($isLaptop); } +my $known_kernels = "$hw_sysconfdir/kernels"; +if (!member($curr_kernel, chomp_(cat_($known_kernels)))) { + harddrake::autoconf::fix_aliases($modules_conf) if !$first_run; + append_to_file($known_kernels, "$curr_kernel\n"); +} + my @cards = ( { ldetect_driver_regexp => 'Card:NVIDIA', |