Author: kmachalkova Date: Thu Sep 24 15:49:49 2009 New Revision: 58749 URL: http://svn.opensuse.org/viewcvs/yast?rev=58749&view=rev Log: Enable SSH service if we're installing over SSH or VNC (bnc#535206) Added: trunk/installation/src/inst_finish/ssh_service_finish.ycp Modified: trunk/installation/src/clients/inst_finish.ycp Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_finish.ycp?rev=58749&r1=58748&r2=58749&view=diff ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Thu Sep 24 15:49:49 2009 @@ -167,6 +167,7 @@ "firewall_stage1", "ntp-client", "ssh_settings", + "ssh_service", "save_hw_status", "users", "autoinst_scripts2", Added: trunk/installation/src/inst_finish/ssh_service_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/ssh_service_finish.ycp?rev=58749&view=auto ============================================================================== --- trunk/installation/src/inst_finish/ssh_service_finish.ycp (added) +++ trunk/installation/src/inst_finish/ssh_service_finish.ycp Thu Sep 24 15:49:49 2009 @@ -0,0 +1,63 @@ +/** + * File: + * ssh_settings_service.ycp + * + * Module: + * Step of base installation finish + * + * Author: + * Bubli + * + * $Id: ssh_service_finish.ycp 54888 2009-01-22 11:47:19Z locilka $ + * + */ + +{ + +textdomain "installation"; + +import "Linuxrc"; +import "Service"; + + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map)WFM::Args(1); +} + +y2milestone ("starting ssh_settings_finish"); +y2debug("func=%1", func); +y2debug("param=%1", param); + +if (func == "Info") +{ + return (any)$[ + "steps" : 1, + // progress step title + "title" : _("Enabling SSH service on installed system..."), + "when" : (Linuxrc::usessh () || Linuxrc::vnc()) ? [ `installation, `autoinst ] : [], + ]; +} +else if (func == "Write") +{ + y2milestone("SSH service will be enabled, this is SSH/VNC installation"); + Service::Enable("sshd"); +} +else +{ + y2error ("unknown function: %1", func); + ret = nil; +} + +y2debug("ret=%1", ret); +y2milestone("ssh_service_finish finished"); +return ret; + + +} /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org