Author: mvidner Date: Fri Jan 13 14:46:05 2012 New Revision: 67190 URL: http://svn.opensuse.org/viewcvs/yast?rev=67190&view=rev Log: Internet test: fail early if NetworkManager has crashed (bnc#739390) svn merge -c67189 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/yast2 Modified: trunk/yast2/ (props changed) trunk/yast2/VERSION trunk/yast2/library/network/src/Internet.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=67190&r1=67189&r2=67190&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Jan 13 14:46:05 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/yast2/library/network/src/Internet.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Internet.ycp?rev=67190&r1=67189&r2=67190&view=diff ============================================================================== --- trunk/yast2/library/network/src/Internet.ycp (original) +++ trunk/yast2/library/network/src/Internet.ycp Fri Jan 13 14:46:05 2012 @@ -167,7 +167,8 @@ // Skip test in case of NM because it returns code 3 (interface under NM controll) if(NetworkService::IsManaged ()){ y2milestone("Skipping interface status test because of NetworkManager"); - return true; + // only check if NM has not crashed + return SCR::Execute(.target.bash, "pgrep NetworkManager") == 0; } integer ret = (integer) SCR::Execute(.target.bash, "/sbin/ifstatus " + device); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=67190&r1=67189&r2=67190&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jan 13 14:46:05 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 13 14:35:47 CET 2012 - mvidner@suse.cz + +- Internet test: fail early if NetworkManager has crashed + (bnc#739390). +- 2.22.3 + +------------------------------------------------------------------- Fri Jan 6 15:06:00 CET 2012 - mvidner@suse.cz - Relicensed ConfigHistory from GPL-2.0 to GPL-2.0+ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org