Author: locilka Date: Fri May 18 13:33:13 2007 New Revision: 38039 URL: http://svn.opensuse.org/viewcvs/yast?rev=38039&view=rev Log: Suppor for both the old and the new way how to enable SSH during installation. Modified: trunk/firewall/src/firewall_proposal.ycp Modified: trunk/firewall/src/firewall_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/firewall_proposal.ycp?rev=38039&r1=38038&r2=38039&view=diff ============================================================================== --- trunk/firewall/src/firewall_proposal.ycp (original) +++ trunk/firewall/src/firewall_proposal.ycp Fri May 18 13:33:13 2007 @@ -125,7 +125,15 @@ // Enable SSH service } else if (chosen_id == "firewall--enable_ssh_in_proposal") { y2milestone("SSH enabled by a single-click"); - SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + + if (SuSEFirewallServices::IsKnownService("service:sshd")) { + y2milestone ("Service 'service:sshd' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + } else if (SuSEFirewallServices::IsKnownService("ssh")) { + y2warning ("Only service 'ssh' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh"); + } + ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org