From 1ecdf66b38c42e7721bbdb08371de7ad6aa1faa2 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 1 Sep 2008 16:47:01 +0000 Subject: 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) --- perl-install/standalone/service_harddrake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'perl-install/standalone') 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', -- cgit v1.2.1