From bc62bd515fce6f9faca5955d1cd4fb41664133f1 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 12 May 2008 12:20:52 +0000 Subject: allow to skip protocol and address configuration (defaulting to dhcp) if AUTOMATIC_ADDRESS is true in /etc/sysconfig/drakx-net --- lib/network/connection_manager.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/network/connection_manager.pm') 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')} ) : (), -- cgit v1.2.1