summaryrefslogtreecommitdiffstats
path: root/lib/network/netconnect.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-05-12 12:20:52 +0000
committerOlivier Blin <oblin@mandriva.com>2008-05-12 12:20:52 +0000
commitbc62bd515fce6f9faca5955d1cd4fb41664133f1 (patch)
tree0ed88763f2f55b5d844bae062907f7aed17144ff /lib/network/netconnect.pm
parentf38d797e29dff82f9c1a6d469b48b8440d3775a7 (diff)
downloaddrakx-net-bc62bd515fce6f9faca5955d1cd4fb41664133f1.tar
drakx-net-bc62bd515fce6f9faca5955d1cd4fb41664133f1.tar.gz
drakx-net-bc62bd515fce6f9faca5955d1cd4fb41664133f1.tar.bz2
drakx-net-bc62bd515fce6f9faca5955d1cd4fb41664133f1.tar.xz
drakx-net-bc62bd515fce6f9faca5955d1cd4fb41664133f1.zip
allow to skip protocol and address configuration (defaulting to dhcp) if AUTOMATIC_ADDRESS is true in /etc/sysconfig/drakx-net
Diffstat (limited to 'lib/network/netconnect.pm')
-rw-r--r--lib/network/netconnect.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm
index 3e90865..eb1b2c6 100644
--- a/lib/network/netconnect.pm
+++ b/lib/network/netconnect.pm
@@ -100,7 +100,7 @@ sub real_main {
"select_protocol" => sub { $connection->can('get_protocols') },
#- peer settings may depend on provider and protocol (VPI/VCI for xDSL)
"configure_access" => sub { $connection->can('get_access_settings') },
- "configure_address" => sub { $connection->can('get_address_settings') || $connection->can('get_hostname_settings') },
+ "configure_address" => sub { ($connection->can('get_address_settings') || $connection->can('get_hostname_settings')) && !text2bool($global_settings{AUTOMATIC_ADDRESS}) },
"configure_control" => sub { $connection->can('get_control_settings') },
"apply_connection" => sub { 1 },
);