From 2ed31a72bb076bc10b885e03941829d9621acae0 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Sun, 3 Oct 2004 16:36:26 +0000
Subject: (sagem_set_parameters, adsl_conf_backend): write static ip in
 eagle-usb.conf if needed for sagem modems, else erase it

---
 perl-install/network/adsl.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/network')

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}) {
-- 
cgit v1.2.1