This commit was manufactured by cvs2svn to create branch

'MDK-10-update'.

1 files changed, 5 insertions, 3 deletions

diff --git a/control-center b/control-center
index df80edff..2ded28cd 100755
--- a/control-center
+++ b/control-center
@@ -287,10 +287,10 @@ my @tree =
                [ "Squid wizard",      "squid", 'drakproxy-mdk', N("Configure proxy") ],
                [ "Samba wizard",      "samba", 'samba_server-mdk', N("Configure Samba") ],
                [ "Time wizard",       "ntp", 'ntp_server-mdk', N("Configure time") ],
-               [ "Web wizard",        "apache2", 'web_server-mdk', N("Configure web server") ]),
+               [ "Web wizard",        "apache2", 'web_server-mdk', N("Configure web") ]),
                [ 'Nis+autofs',        "nisautofs",  'nisautofs', N("Configure NIS and Autofs") ],
                [ "Install server",    "installsrv", 'wizard-mdk', N("Configure installation server") ],
-               if_(0, [ "Pxe",               "pxe",        'pxe-server', N("Configure PXE") ]),
+               [ "Pxe",               "pxe",        'pxe-server', N("Configure PXE") ],
 
             )
            ]
@@ -467,6 +467,8 @@ my @menu_items = (
 
 my ($menu, $factory) = create_factory_menu($window_global, @menu_items);
 
+network::netconnect::read_net_conf('', $netcnx, $netc);
+
 # to retrieve a path, one must prevent "accelerators completion":
 sub get_path { join('', map { my $i = $_; $i =~ s/_//; $i } @_) }
 
@@ -491,7 +493,7 @@ sub update_profiles {
     my ($removing) = @_;
     my $done;
     $factory->delete_item(get_path("<main>", $shared_translations{profiles} . profile2menu($_))) foreach @profiles;
-    network::netconnect::read_net_conf($netcnx, $netc, $intf);
+    network::netconnect::load_conf($netcnx, $netc, $intf);    #reread_net_conf();
     @profiles = network::netconnect::get_profiles();
     foreach my $prof (@profiles) {
         $factory->create_item([ $shared_translations{profiles} . profile2menu($prof), undef, sub {