summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-16 16:10:32 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-16 16:10:32 +0000
commitda188129369fdbff0dfb3d280255dfba91d736b4 (patch)
tree1571ecec4f86044dd54b41227a8aafd842c8c414 /perl-install/install2.pm
parent034c6d8da3c3c3144ad29ceb05926858f2f67ff6 (diff)
downloaddrakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar.gz
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar.bz2
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar.xz
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.zip
automatically configure DSL connection on installation from DSL
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm18
1 files changed, 16 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 220114975..a7a29d35a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -468,8 +468,22 @@ sub main {
log::l("found network config file $file");
add2hash($o->{net}{resolv} ||= {}, network::network::read_resolv_conf($file));
}
- $o->{net}{type} = 'lan';
- $o->{net}{net_interface} = first(values %{$o->{net}{ifcfg}});
+ my $dsl_device = find { $_->{BOOTPROTO} eq 'adsl_pppoe' } values %{$o->{net}{ifcfg}};
+ if ($dsl_device) {
+ $o->{net}{type} = 'adsl';
+ $o->{net}{net_interface} = $dsl_device->{DEVICE};
+ $o->{net}{adsl} = {
+ method => 'pppoe',
+ device => 'pppoe_modem',
+ ethernet_device => $dsl_device->{DEVICE},
+ login => $dsl_device->{USER},
+ password => $dsl_device->{PASS},
+ };
+ %$dsl_device = ();
+ } else {
+ $o->{net}{type} = 'lan';
+ $o->{net}{net_interface} = first(values %{$o->{net}{ifcfg}});
+ }
}
#- done after module dependencies are loaded for "vfat depends on fat"