Author: kmachalkova Date: Fri Aug 14 17:58:27 2009 New Revision: 58349 URL: http://svn.opensuse.org/viewcvs/yast?rev=58349&view=rev Log: ... only if we have openssh pack Modified: trunk/network/src/clients/firewall_stage1_finish.ycp Modified: trunk/network/src/clients/firewall_stage1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_stage1_finish.ycp?rev=58349&r1=58348&r2=58349&view=diff ============================================================================== --- trunk/network/src/clients/firewall_stage1_finish.ycp (original) +++ trunk/network/src/clients/firewall_stage1_finish.ycp Fri Aug 14 17:58:27 2009 @@ -38,18 +38,24 @@ } else if (func == "Write") { + //we have those from the proposal boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); y2milestone("After installation, firewall will be %1, ssh port will be %2", fw_enabled ? "enabled" : "disabled", ssh_enabled ? "open" : "closed"); + //now read the config from SuSEfirewall2 RPM SuSEFirewall::Read(); + //and merge SuSEFirewall::SetEnableService( fw_enabled ); SuSEFirewall::SetStartService( fw_enabled ); - SuSEFirewall::SetServicesForZones (["service:sshd"], SuSEFirewall::GetKnownFirewallZones(), ssh_enabled ); + //only if we have openssh package - proposal takes care + //it gets installed if the user wants to open ssh port + if (ssh_enabled) + SuSEFirewall::SetServicesForZones (["service:sshd"], SuSEFirewall::GetKnownFirewallZones(), true ); SuSEFirewall::Write(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org