diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-10-03 16:36:26 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-10-03 16:36:26 +0000 |
| commit | 2ed31a72bb076bc10b885e03941829d9621acae0 (patch) | |
| tree | 46030a06a4f2d50d8fac8f1c2388befa37b831a6 | |
| parent | 30411c4ddd878b8bf314665cf59483e27f5340ad (diff) | |
| download | drakx-2ed31a72bb076bc10b885e03941829d9621acae0.tar drakx-2ed31a72bb076bc10b885e03941829d9621acae0.tar.gz drakx-2ed31a72bb076bc10b885e03941829d9621acae0.tar.bz2 drakx-2ed31a72bb076bc10b885e03941829d9621acae0.tar.xz drakx-2ed31a72bb076bc10b885e03941829d9621acae0.zip | |
(sagem_set_parameters, adsl_conf_backend): write static ip in
eagle-usb.conf if needed for sagem modems, else erase it
| -rw-r--r-- | perl-install/network/adsl.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index d484a3d0a..eaafebddb 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -101,6 +101,8 @@ sub sagem_set_parameters { s/VCI=.*\n/VCI=$l{vci}\n/; s/VPI=.*\n/VPI=$l{vpi}\n/; s/Encapsulation=.*\n/Encapsulation=$l{Encapsulation}\n/; + s/STATIC_IP=.*\n//; + s!</eaglectrl>!STATIC_IP=$netc->{static_ip}\n</eaglectrl>"! if $netc->{static_ip}; } "$::prefix$cfg_file"; } } @@ -355,7 +357,10 @@ METRIC=$metric unlink("$::prefix/etc/sysconfig/network-scripts/ifcfg-sagem"); #- set vpi, vci and encapsulation parameters for sagem - sagem_set_parameters($netc) if $adsl_device eq 'sagem'; + if ($adsl_device eq 'sagem') { + $netc->{static_ip} = $intf->{sagem}{IPADDR} if $adsl_type eq 'manual'; + sagem_set_parameters($netc); + } #- set aliases if (exists $modems{$adsl_device}{aliases}) { |