Author: mzugec Date: Wed Nov 5 16:56:53 2008 New Revision: 52943 URL: http://svn.opensuse.org/viewcvs/yast?rev=52943&view=rev Log: in case of proposed bridger network do "rcnetwork restart" (timeout popup confirmation) also for vnc/ssh/x11 installation (bnc#431500) 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=52943&r1=52942&r2=52943&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Nov 5 16:56:53 2008 @@ -1 +1 @@ -2.17.50 +2.17.51 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=52943&r1=52942&r2=52943&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Nov 5 16:56:53 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Nov 5 16:49:02 CET 2008 - mzugec@suse.cz + +- in case of proposed bridger network do "rcnetwork restart" +(timeout popup confirmation) also for vnc/ssh/x11 installation +(bnc#431500) +- 2.14.51 + +------------------------------------------------------------------- Fri Oct 31 12:19:25 CET 2008 - mzugec@suse.de - for devices without hwinfo (bridge, vlan, ...) dont propose Modified: trunk/network/src/clients/lan_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_proposal.ycp?rev=52943&r1=52942&r2=52943&view=diff ============================================================================== --- trunk/network/src/clients/lan_proposal.ycp (original) +++ trunk/network/src/clients/lan_proposal.ycp Wed Nov 5 16:56:53 2008 @@ -131,7 +131,7 @@ // popup already shown y2error("Packages installation failure, not saving"); } - else if (Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh () ) + else if ((!Lan::virt_net_proposal) && (Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh ()) ) { y2milestone ("write only"); Lan::WriteOnly(); Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=52943&r1=52942&r2=52943&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Nov 5 16:56:53 2008 @@ -42,6 +42,7 @@ import "Linuxrc"; import "Stage"; import "LanUdevAuto"; +import "Label"; include "network/complex.ycp"; include "network/runtime.ycp"; @@ -438,9 +439,45 @@ // during installation export sysconfig settings into NetworkManager (bnc#433084) 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())){ + UI::OpenDialog(`opt(`decorated), `HBox( + `HSpacing(1), + `HCenter(`HSquash(`VBox( + `HCenter(`HSquash(`VBox( + // This is the heading of the popup box + `Left(`Heading(_("Confirm Network Restart"))), + `VSpacing(0.5), + // This is in information message. Next come the + // hardware class name (network cards). + `HVCenter(`Label(_("Because of bridged network YaST2 needs to restart network to apply the settings."))), + `VSpacing(0.5) + ))), + `ButtonBox ( + `HWeight (1, `PushButton (`id(`ok), `opt(`default, `okButton), Label::OKButton())), + /* PushButton label */ + `HWeight (1, `PushButton (`id (`cancel), `opt (`cancelButton), Label::CancelButton())) + ), + `VSpacing(0.2) + ))), + `HSpacing(1) + )); + + UI::SetFocus (`id(`ok)); + + // for autoinstallation popup has timeout 10 seconds (#192181) + // timeout for every case (bnc#429562) + any ret = UI::TimeoutUserInput(10*1000); + if (ret==`ok){ + y2internal("Restarting network because of bridged proposal"); + Service::Restart("network"); + } + UI::CloseDialog(); + } + // 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("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"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org