diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-05-12 12:38:23 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-05-12 12:38:23 +0000 |
| commit | 2f8375b74f79a7926c310daaaeef4d3c6068e014 (patch) | |
| tree | 9a887a150ba96449001edbca76e3c829fe2510db /lib/network/connection_manager.pm | |
| parent | afa9c4395c7aff570b871ae1a360e299a6e05d59 (diff) | |
| download | drakx-net-distro/mdv2008.0.tar drakx-net-distro/mdv2008.0.tar.gz drakx-net-distro/mdv2008.0.tar.bz2 drakx-net-distro/mdv2008.0.tar.xz drakx-net-distro/mdv2008.0.zip | |
allow to skip protocol and address configuration (defaulting to dhcp) if AUTOMATIC_ADDRESS is true in /etc/sysconfig/drakx-netdistro/mdv2008.0
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 53a0312..02037c1 100644 --- a/lib/network/connection_manager.pm +++ b/lib/network/connection_manager.pm @@ -110,6 +110,8 @@ sub configure_connection { } load_settings($cmanager); + my $system_file = '/etc/sysconfig/drakx-net'; + my %global_settings = getVarsFromSh($system_file); my $error; do { @@ -132,7 +134,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')} ) : (), |