diff options
Diffstat (limited to 'perl-install/standalone/service_harddrake')
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 86037034a..c661468f3 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -176,7 +176,7 @@ my @cards = ( { ldetect_driver_regexp => 'Card:NVIDIA', xorg_driver_regexp => 'nv.+', - module_names => [ qw(NVdriver nvidia.o nvidia.ko nvidia71xx.ko nvidia96xx.ko nvidia97xx.ko nvidia173.ko nvidia-current.ko) ] + module_names => [ qw(NVdriver nvidia.o nvidia.ko nvidia71xx.ko nvidia96xx.ko nvidia97xx.ko nvidia173.ko nvidia304.ko nvidia-current.ko) ] }, { ldetect_driver_regexp => 'Card:ATI Radeon', @@ -320,15 +320,9 @@ foreach my $hw_class (@harddrake::data::tree) { harddrake::sound::configure_sound_slots($modules_conf); next; } elsif ($Ident eq "ETHERNET") { - $modules_conf->remove_alias_regexp('^(wlan|eth)[0-9]*$'); - modules::load_category($modules_conf, 'network/main|gigabit|usb|wireless|firewire|pcmcia'); - require network::connection::ethernet; - network::connection::ethernet::configure_eth_aliases($modules_conf); - require network::rfswitch; - network::rfswitch::configure(); - require network::shorewall; - network::shorewall::update_interfaces_list(); - $modules_conf->write; + require interactive; + $in ||= interactive->vnew; + harddrake::autoconf::network_conf($modules_conf, $in, [ @ID{@added} ]); next; } elsif (member($Ident, qw(ATA_STORAGE CARD_READER RAID_STORAGE SATA_STORAGE SCSI_CONTROLLER))) { # set scsi_hostadapter in modprobe.conf: |