summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-12-06 18:33:38 +0000
committerOlivier Blin <oblin@mandriva.org>2005-12-06 18:33:38 +0000
commit11156d39cdfc139682cc5be52547533cb990461b (patch)
tree77b3757eae99b1e485f7636e304a63d0163077ed
parentdf0269f48c6c9d5e8901e1b2e01f1383c9d7e2d6 (diff)
downloaddrakx-11156d39cdfc139682cc5be52547533cb990461b.tar
drakx-11156d39cdfc139682cc5be52547533cb990461b.tar.gz
drakx-11156d39cdfc139682cc5be52547533cb990461b.tar.bz2
drakx-11156d39cdfc139682cc5be52547533cb990461b.tar.xz
drakx-11156d39cdfc139682cc5be52547533cb990461b.zip
don't overwrite ONBOOT setting when writing adsl configuration
-rw-r--r--perl-install/network/adsl.pm3
1 files changed, 2 insertions, 1 deletions
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");