summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2013-05-07 00:14:02 +0000
committerOlivier Blin <blino@mageia.org>2013-05-07 00:14:02 +0000
commitc12736224ec5d7b0a6fd745fa0b0cd657ecf73a1 (patch)
treec1ece7b8fda4af6c2b1a8375b49e67d16bcda03b
parentf78ea46eab76c12d46b4eb727d0d227cef7c7bd5 (diff)
downloaddrakx-c12736224ec5d7b0a6fd745fa0b0cd657ecf73a1.tar
drakx-c12736224ec5d7b0a6fd745fa0b0cd657ecf73a1.tar.gz
drakx-c12736224ec5d7b0a6fd745fa0b0cd657ecf73a1.tar.bz2
drakx-c12736224ec5d7b0a6fd745fa0b0cd657ecf73a1.tar.xz
drakx-c12736224ec5d7b0a6fd745fa0b0cd657ecf73a1.zip
harddrake: move ethernet config in harddrake::autoconf::network_conf
-rw-r--r--perl-install/harddrake/autoconf.pm11
-rwxr-xr-xperl-install/standalone/service_harddrake10
2 files changed, 11 insertions, 10 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index a12662b60..a82446db6 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -25,7 +25,16 @@ sub xconf {
}
sub network_conf {
- my ($obj) = @_;
+ my ($modules_conf) = @_;
+ $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;
}
sub mouse_conf {
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 2e96fe6c7..fd86fb4f2 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -320,15 +320,7 @@ 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;
+ harddrake::autoconf::network_conf($modules_conf);
next;
} elsif (member($Ident, qw(ATA_STORAGE CARD_READER RAID_STORAGE SATA_STORAGE SCSI_CONTROLLER))) {
# set scsi_hostadapter in modprobe.conf: