diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 07:21:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 07:21:04 +0000 |
| commit | 89e2c0f66b7aac23562cac0c22a3b71f388fe568 (patch) | |
| tree | 30cddc6802f479466a92af9e5b89a77c8139095f /perl-install/network | |
| parent | dd69bb2017f7dad5911f7117b7863f20baae83b1 (diff) | |
| download | drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.gz drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.bz2 drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.xz drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.zip | |
modules::mergein_conf() doesn't need to be given /etc/modules.conf
=> prepare for reading either modprobe.conf or modules.conf based on the running kernel version
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/ethernet.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index a6e58df1b..ea322a7f2 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -50,7 +50,7 @@ sub get_eth_cards() { my @all_cards = detect_devices::getNet(); my @devs = detect_devices::pcmcia_probe(); - modules::mergein_conf("$::prefix/etc/modules.conf"); + modules::mergein_conf(); my $saved_driver; return map { my $interface = $_; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 1a3a046ff..76a7fdba7 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -121,7 +121,7 @@ sub real_main { $netc->{NET_INTERFACE} = $netcnx->{NET_INTERFACE} if $netcnx->{NET_INTERFACE}; # REDONDANCE with read_conf. FIXME network::network::read_all_conf($::prefix, $netc, $intf); - modules::mergein_conf("$::prefix/etc/modules.conf"); + modules::mergein_conf(); $netc->{autodetect} = {}; |