Author: kmachalkova Date: Thu Nov 19 16:10:53 2009 New Revision: 59623 URL: http://svn.opensuse.org/viewcvs/yast?rev=59623&view=rev Log: I know I will be to blame for everything that goes wrong along these lines, but I can't decrypt it in its current form anymore. Sorry Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp?rev=59623&r1=59622&r2=59623&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Thu Nov 19 16:10:53 2009 @@ -444,7 +444,7 @@ if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); y2internal("virt_net_proposal %1", virt_net_proposal); - if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())){ + if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { UI::OpenDialog(`opt(`decorated), `HBox( `HSpacing(1), `HCenter(`HSquash(`VBox( @@ -480,11 +480,14 @@ } // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) - else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) Service::Restart("network"); - else if(Service::Status("network")==0){ - Service::Reload("network"); - } else Service::Restart("network"); + else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) + y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) + Service::Restart("network"); + else if(Service::Status("network")==0){ + Service::Reload("network"); + } + else Service::Restart("network"); // NetworkService::StartStop (); sleep(sl); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org