Author: kmachalkova Date: Fri Aug 14 15:02:32 2009 New Revision: 58342 URL: http://svn.opensuse.org/viewcvs/yast?rev=58342&view=rev Log: Initialize with values from control file Modified: trunk/network/src/clients/firewall_stage1_proposal.ycp Modified: trunk/network/src/clients/firewall_stage1_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_stage1_proposal.ycp?rev=58342&r1=58341&r2=58342&view=diff ============================================================================== --- trunk/network/src/clients/firewall_stage1_proposal.ycp (original) +++ trunk/network/src/clients/firewall_stage1_proposal.ycp Fri Aug 14 15:02:32 2009 @@ -28,14 +28,29 @@ { textdomain "network"; + import "ProductFeatures"; import "SuSEFirewall4Network"; + import "SuSEFirewallProposal"; + + // run this only once + if (!SuSEFirewallProposal::GetProposalInitialized()) { + + // variables from control file + y2milestone("Default firewall values: enable_firewall=%1, enable_ssh=%2", + ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"), + ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); + + SuSEFirewall4Network::SetEnabled1stStage(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); + SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); + + SuSEFirewallProposal::SetProposalInitialized(true); + } + string func = (string)WFM::Args(0); map param = (map)WFM::Args(1); map ret = $[]; - boolean ssh_enabled = false; - if ( func == "MakeProposal" ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org