[yast-commit] r53718 - in /trunk/network: VERSION package/yast2-network.changes src/clients/lan_proposal.ycp src/modules/Lan.ycp
![](https://seccdn.libravatar.org/avatar/4b1b602021abbfa5a5994ab0ad90e8b7.jpg?s=120&d=mm&r=g)
Author: mzugec Date: Fri Nov 28 16:56:07 2008 New Revision: 53718 URL: http://svn.opensuse.org/viewcvs/yast?rev=53718&view=rev Log: don't show "no network running" popup for automatic installation (bnc#449777) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_proposal.ycp trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=53718&r1=53717&r2=53718&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Nov 28 16:56:07 2008 @@ -1 +1 @@ -2.17.59 +2.17.60 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=53718&r1=53717&r2=53718&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Nov 28 16:56:07 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 28 16:52:22 CET 2008 - mzugec@suse.cz + +- don't show "no network running" popup for automatic installation + (bnc#449777) +- 2.17.60 + +------------------------------------------------------------------- Fri Nov 28 14:58:43 CET 2008 - mzugec@suse.cz - support for portnumber option (fate#304080) Modified: trunk/network/src/clients/lan_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_proposal.ycp?rev=53718&r1=53717&r2=53718&view=diff ============================================================================== --- trunk/network/src/clients/lan_proposal.ycp (original) +++ trunk/network/src/clients/lan_proposal.ycp Fri Nov 28 16:56:07 2008 @@ -32,6 +32,8 @@ map param = args[1]:$[]; map ret = $[]; +Lan::automatic_configuration = GetInstArgs::automatic_configuration(); + /* create a textual proposal */ if(func == "MakeProposal") { string proposal = ""; Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=53718&r1=53717&r2=53718&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Nov 28 16:56:07 2008 @@ -66,6 +66,12 @@ * boolean start_immediately = false; */ +/** + * boolean if we do automatic installation in second stage + */ + +global boolean automatic_configuration=false; + // ipv6 module global boolean ipv6=true; @@ -514,7 +520,10 @@ sleep(1000); timeout = timeout-1; } - if (!network) Popup::Error(_("No network running")); + if (!network) { + if (automatic_configuration) y2error("No network running"); + else Popup::Error(_("No network running")); + } } /* Final progress step */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
mzugec@svn.opensuse.org