summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-30 14:09:59 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-30 14:09:59 +0000
commit9026f95f40602886f7d150d648d49988384a0d62 (patch)
treee2157968f1086b36f94491f32f9ad6db357f4c16
parent1f2b819d449bcc11a62efcabccb67064ec6c4ce4 (diff)
downloaddrakx-backup-do-not-use-9026f95f40602886f7d150d648d49988384a0d62.tar
drakx-backup-do-not-use-9026f95f40602886f7d150d648d49988384a0d62.tar.gz
drakx-backup-do-not-use-9026f95f40602886f7d150d648d49988384a0d62.tar.bz2
drakx-backup-do-not-use-9026f95f40602886f7d150d648d49988384a0d62.tar.xz
drakx-backup-do-not-use-9026f95f40602886f7d150d648d49988384a0d62.zip
write ifcfg files for NET_DEVICE if it's ethernet (pptp, pppoe)
-rw-r--r--perl-install/network/adsl.pm16
1 files changed, 14 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 985a999a8..c22ee22c8 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -94,7 +94,7 @@ sub adsl_detect() {
}
sub adsl_conf_backend {
- my ($in, $modules_conf, $adsl, $netc, $adsl_device, $adsl_type, $o_netcnx) = @_;
+ my ($in, $modules_conf, $adsl, $netc, $intf, $adsl_device, $adsl_type, $o_netcnx) = @_;
# FIXME: should not be needed:
defined $o_netcnx and $netc->{adsltype} = $o_netcnx->{type};
$netc->{adsltype} ||= "adsl_$adsl_type";
@@ -268,7 +268,19 @@ user "$adsl->{login}"
));
write_secret_backend($adsl->{login}, $adsl->{passwd});
-
+
+ if ($netc->{NET_DEVICE} =~ /^eth/) {
+ my $net_device = $netc->{NET_DEVICE};
+ $intf->{$net_device} = {
+ DEVICE => $net_device,
+ BOOTPROTO => 'none',
+ NETMASK => '255.255.255.0',
+ NETWORK => '10.0.0.0',
+ BROADCAST => '10.0.0.255',
+ ONBOOT => 'yes',
+ };
+ }
+
if ($adsl_type eq 'pppoe') {
my $net_device = $modems{$adsl_device}{get_intf} ? "`$modems{$adsl_device}{get_intf}`" : $netc->{NET_DEVICE};
substInFile {