From 11156d39cdfc139682cc5be52547533cb990461b Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Tue, 6 Dec 2005 18:33:38 +0000
Subject: don't overwrite ONBOOT setting when writing adsl configuration

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

(limited to 'perl-install/network')

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index fa78937ca..3768c171b 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -291,8 +291,9 @@ user "$net->{adsl}{login}"
         DEVICE => 'ppp0',
         TYPE => 'ADSL',
         METRIC => $metric,
-        ONBOOT => 'yes', #- will be modified later in netconnect if requested
     }) unless member($adsl_type, qw(static dhcp));
+    #- don't overwrite ONBOOT setting, it may have been handled earlier in netconnect
+    $net->{ifcfg}{ppp0}{ONBOOT} ||= 'yes';
 
     #- remove file used with sagem for dhcp/static connections
     unlink("$::prefix/etc/sysconfig/network-scripts/ifcfg-sagem");
-- 
cgit v1.2.1