diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-16 15:12:58 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-16 15:12:58 +0000 |
| commit | 4bf2503e91fa8ec2a14aec911586d274a37f3273 (patch) | |
| tree | b3a10569d4bde8bf945dcd955b0ec942bca03ad3 | |
| parent | 5f946ad9c70c805717e29b533a55e43b398b0f80 (diff) | |
| download | drakx-4bf2503e91fa8ec2a14aec911586d274a37f3273.tar drakx-4bf2503e91fa8ec2a14aec911586d274a37f3273.tar.gz drakx-4bf2503e91fa8ec2a14aec911586d274a37f3273.tar.bz2 drakx-4bf2503e91fa8ec2a14aec911586d274a37f3273.tar.xz drakx-4bf2503e91fa8ec2a14aec911586d274a37f3273.zip | |
on startup, redo ethX aliases
| -rw-r--r-- | perl-install/harddrake/data.pm | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 308704b3d..f183f0d1e 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -10,6 +10,9 @@ our ($version, $sbindir, $bindir) = ("10", "/usr/sbin", "/usr/bin"); my @devices = detect_devices::probeall(); + +# 10.2: REMOVE ALL BLACKLISTING FROM unknown() since f() has already filter out matched devices + # Update me each time you handle one more devices class (aka configurator) sub unknown() { grep { $_->{media_type} !~ /BRIDGE|class\|Mouse|DISPLAY|Hub|MEMORY_RAM|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|NETWORK|Printer|SERIAL_(USB|SMBUS)|STORAGE_(IDE|OTHER|SCSI)|SYSTEM_OTHER|tape|UPS/ @@ -211,7 +214,7 @@ our @tree = || member($_->{driver}, @net_modules); } @devices); }, - checked_on_boot => 0, + checked_on_boot => 1, }, { diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index e428145d9..4069551b6 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -113,6 +113,10 @@ foreach my $hw_class (@harddrake::data::tree) { modules::load_and_configure($modules_conf, 'ohci1394') if $Ident eq 'FIREWIRE_CONTROLLER' && any { $_->{driver} eq 'ohci1394' } @added; @added || @was_removed or next; + if (harddrake::data::is_removable($Ident)) { + modules::load_category('floppy') if $Ident eq 'FLOPPY'; + } + next if $Ident eq 'MOUSE' && $curr_kernel ne $prev_kernel; my @configurator_pool; @@ -138,6 +142,7 @@ foreach my $hw_class (@harddrake::data::tree) { network::ethernet::update_iftab(); network::ethernet::configure_eth_aliases($modules_conf); $modules_conf->write; + next; } elsif (member($Ident, qw(AGP ATA_STORAGE SATA_STORAGE SCSI_CONTROLLER TV))) { # add agpgart and the like modules to modprobe.preload if needed: $modules_conf->write; |