diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-04-21 13:47:02 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-04-21 13:47:02 +0000 |
| commit | 245525de2ed3ea330af6182580d981ad9519d79e (patch) | |
| tree | e65e7ffdf5f4132c3e4ee6bff557f097266e7713 | |
| parent | 5bd938cf321060a5bb7870ab013274e1cfc9681b (diff) | |
| download | drakx-backup-do-not-use-245525de2ed3ea330af6182580d981ad9519d79e.tar drakx-backup-do-not-use-245525de2ed3ea330af6182580d981ad9519d79e.tar.gz drakx-backup-do-not-use-245525de2ed3ea330af6182580d981ad9519d79e.tar.bz2 drakx-backup-do-not-use-245525de2ed3ea330af6182580d981ad9519d79e.tar.xz drakx-backup-do-not-use-245525de2ed3ea330af6182580d981ad9519d79e.zip | |
do not crash if loading new drivers fails (happened with amd64_agp wrongly listed in pcitable, #43870)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 25acafae4..ff4cd1de3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -5,6 +5,9 @@ o render ext4 partition as red like ext3 ones - harddrake: o fix wrongly selecting some 32bits packages on x86_64 (#50148) +- service_harddrake: + o do not crash if loading new drivers fails + (happened with amd64_agp wrongly listed in pcitable, #43870) Version 12.29 - 21 April 2009 diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index deaea0b8d..c2705d042 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -186,7 +186,10 @@ foreach my $hw_class (@harddrake::data::tree) { $modules_conf->remove_module(difference2(\@old_drivers, \@new_drivers)); # add agpgart and the like modules to modprobe.preload if needed: $modules_conf->write; - modules::load(difference2(\@new_drivers, \@old_drivers)); + foreach (difference2(\@new_drivers, \@old_drivers)) { + eval { modules::load($_) }; + warn "warning: $@" if $@; + } next; } elsif ($Ident eq "BLUETOOTH") { harddrake::autoconf::bluetooth(scalar keys %ID); |