Author: mzugec Date: Mon Aug 4 15:57:14 2008 New Revision: 49646 URL: http://svn.opensuse.org/viewcvs/yast?rev=49646&view=rev Log: for ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49646&r1=49645&r2=49646&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Aug 4 15:57:14 2008 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=49646&r1=49645&r2=49646&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Aug 4 15:57:14 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 4 15:56:34 CEST 2008 - mzugec@suse.cz + +- for ssh/vnc installation don't reload/restart network because + possibility of IP change (bnc#347482) +- 2.17.15 + +------------------------------------------------------------------- Mon Aug 4 13:22:38 CEST 2008 - mzugec@suse.cz - improved Lan::Packages() function Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=49646&r1=49645&r2=49646&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Aug 4 15:57:14 2008 @@ -39,6 +39,8 @@ import "PackageSystem"; import "LanItems"; import "ModuleLoading"; +import "Linuxrc"; +import "Stage"; include "network/complex.ycp"; include "network/runtime.ycp"; @@ -399,10 +401,12 @@ if(Abort()) return false; /* Progress step 6 */ ProgressNextStage(_("Writing hostname and DNS configuration...")); + // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) + if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); + else NetworkService::StartStop (); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup - if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); - else NetworkService::StartStop (); DNS::Write(); Host::Write(); Progress::set (orig); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org