diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-05-12 12:20:52 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-05-12 12:20:52 +0000 |
| commit | bc62bd515fce6f9faca5955d1cd4fb41664133f1 (patch) | |
| tree | 0ed88763f2f55b5d844bae062907f7aed17144ff /lib/network/connection_manager.pm | |
| parent | f38d797e29dff82f9c1a6d469b48b8440d3775a7 (diff) | |
| download | drakx-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/connection_manager.pm')
| -rw-r--r-- | lib/network/connection_manager.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm index 5cf9176..09949d9 100644 --- a/lib/network/connection_manager.pm +++ b/lib/network/connection_manager.pm @@ -121,6 +121,8 @@ sub configure_connection { } $cmanager->load_settings; + my $system_file = '/etc/sysconfig/drakx-net'; + my %global_settings = getVarsFromSh($system_file); my $error; do { @@ -143,7 +145,7 @@ sub configure_connection { { label => $cmanager->{connection}->get_access_settings_label, title => 1, advanced => 1 }, @{$cmanager->{connection}->get_access_settings} ) : (), - $cmanager->{connection}->can('get_address_settings') ? ( + $cmanager->{connection}->can('get_address_settings') && !text2bool($global_settings{AUTOMATIC_ADDRESS}) ? ( { label => $cmanager->{connection}->get_address_settings_label, title => 1, advanced => 1 }, @{$cmanager->{connection}->get_address_settings('show_all')} ) : (), |