Author: mzugec Date: Wed Oct 1 14:16:48 2008 New Revision: 51739 URL: http://svn.opensuse.org/viewcvs/yast?rev=51739&view=rev Log: - use Service::Restart instead of bash agent - don't restart network twice in Lan::Write() 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=51739&r1=51738&r2=51739&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 1 14:16:48 2008 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=51739&r1=51738&r2=51739&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 1 14:16:48 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 1 14:13:17 CEST 2008 - mzugec@suse.de + +- use Service::Restart instead of bash agent +- don't restart network twice in Lan::Write() +- 2.17.33 + +------------------------------------------------------------------- Thu Sep 25 19:28:57 CEST 2008 - mzugec@suse.de - copy udev files for s390 (bnc#422150) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=51739&r1=51738&r2=51739&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Oct 1 14:16:48 2008 @@ -326,7 +326,7 @@ global define boolean Write() { y2milestone("Writing configuration"); - if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); +// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ if(!LanItems::modified) { @@ -403,10 +403,6 @@ 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 DNS::Write(); @@ -438,7 +434,13 @@ /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); // NetworkModules::HwUp (); - NetworkService::StartStop (); + // 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) Service::Restart("rcnetwork"); + 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