July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64723 - in /trunk/http-server: package/yast2-http-server.changes src/HttpServer.ycp src/HttpServerWidgets.ycp src/helps.ycp src/http-server.ycp
by snwint＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: snwint Date: Mon Jul 4 13:49:14 2011 New Revision: 64723 URL: http://svn.opensuse.org/viewcvs/yast?rev=64723&view=rev Log: - fixed typos (bnc #703114) Modified: trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServer.ycp trunk/http-server/src/HttpServerWidgets.ycp trunk/http-server/src/helps.ycp trunk/http-server/src/http-server.ycp Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Mon Jul 4 13:49:14 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 4 11:29:10 CEST 2011 - snwint(a)suse.de + +- fixed typos (bnc #703114) + +------------------------------------------------------------------- Thu Jun 16 09:43:37 CEST 2011 - locilka(a)suse.cz - Fixed 'do not use switch/case' error by replacing with Modified: trunk/http-server/src/HttpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServer.ycp?r… ============================================================================== --- trunk/http-server/src/HttpServer.ycp (original) +++ trunk/http-server/src/HttpServer.ycp Mon Jul 4 13:49:14 2011 @@ -88,11 +88,11 @@ global void setWizardMode(boolean w_mode){ if(w_mode==true){ SCR::Execute(.target.bash, sformat("rm %1%2", Directory::vardir, "/http_server")); - y2milestone("Set wizardmode on"); + y2milestone("Set wizard mode on"); } else{ SCR::Write ( .target.string, Directory::vardir + "/http_server", ""); - y2milestone("Set wizardmode off"); + y2milestone("Set wizard mode off"); } } Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Mon Jul 4 13:49:14 2011 @@ -1061,7 +1061,7 @@ `Left( `RadioButton(`id(`all_addr),`opt(`notify), _("All addresses (*)"), true)), `Left(`RadioButton(`id(`multiselect),`opt(`notify), "")), `MultiSelectionBox( `id(`ipaddress), - _("IP Adresses"), items ) + _("IP Addresses"), items ) , `Left(`RadioButton(`id(`custom),`opt(`notify), "")), `TextEntry(`id(`serv_name), _("ServerName")) Modified: trunk/http-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/helps.ycp?rev=64… ============================================================================== --- trunk/http-server/src/helps.ycp (original) +++ trunk/http-server/src/helps.ycp Mon Jul 4 13:49:14 2011 @@ -70,7 +70,7 @@ // apache service enabling help 1/1 "server_enable" : _("<big>HTTP Server Settings</big> -Activate the HTTP server by choosing Enabled. To deactive it, choose +Activate the HTTP server by choosing Enabled. To deactivate it, choose Disabled. ") , Modified: trunk/http-server/src/http-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/http-server.ycp?… ============================================================================== --- trunk/http-server/src/http-server.ycp (original) +++ trunk/http-server/src/http-server.ycp Mon Jul 4 13:49:14 2011 @@ -345,7 +345,7 @@ "handler" : HostsHandler ], "mode" : $[ - "help" : _("Enable or disable wizardmode."), + "help" : _("Enable or disable wizard mode."), "handler" : ModeHandler ], ], @@ -411,7 +411,7 @@ ], "wizard" : $[ "type" : "string", - "help" : _("Set wizardmode \"on\" or \"off\".") + "help" : _("Set wizard mode \"on\" or \"off\".") ] ], "mappings" : $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64722 - in /trunk/wagon/src: include/ modules/
by lslezak＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: lslezak Date: Mon Jul 4 13:40:11 2011 New Revision: 64722 URL: http://svn.opensuse.org/viewcvs/yast?rev=64722&view=rev Log: updated svn:ignore property Modified: trunk/wagon/src/include/ (props changed) trunk/wagon/src/modules/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64721 - in /trunk/wagon: package/yast2-wagon.changes src/clients/welcome_in_wagon.ycp
by lslezak＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: lslezak Date: Mon Jul 4 13:38:33 2011 New Revision: 64721 URL: http://svn.opensuse.org/viewcvs/yast?rev=64721&view=rev Log: wagon - if the system is managed by SUSE Manager display a message and exit (fate#311994) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/welcome_in_wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Jul 4 13:38:33 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 4 11:28:46 UTC 2011 - lslezak(a)suse.cz + +- if the system is managed by SUSE Manager display a message + and exit (fate#311994) + +------------------------------------------------------------------- Fri Jul 1 08:52:27 UTC 2011 - lslezak(a)suse.cz - .spec file - fixed file list Modified: trunk/wagon/src/clients/welcome_in_wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/welcome_in_wag… ============================================================================== --- trunk/wagon/src/clients/welcome_in_wagon.ycp (original) +++ trunk/wagon/src/clients/welcome_in_wagon.ycp Mon Jul 4 13:38:33 2011 @@ -21,6 +21,7 @@ import "Popup"; import "Wagon"; import "Report"; + import "FileUtils"; textdomain "wagon"; @@ -41,6 +42,18 @@ GetInstArgs::enable_back(), GetInstArgs::enable_next()); Wizard::EnableAbortButton (); + // file /etc/sysconfig/rhn/systemid means the system is managed by SUSE Manager + if (FileUtils::Exists("/etc/sysconfig/rhn/systemid")) + { + y2milestone("File /etc/sysconfig/rhn/systemid found, aborting wagon"); + + // warning message, system managed by SUSE Manager cannot be migrated by wagon + // display this message and exit + Popup::Message(_("This system is managed by SUSE Manager,\nYaST wagon module cannot migrate systems managed by SUSE Manager.\n\nPress OK to exit.")); + + return (any)`back; + } + any ret = nil; while (true) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64720 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/welcome_in_wagon.ycp
by lslezak＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: lslezak Date: Mon Jul 4 13:38:03 2011 New Revision: 64720 URL: http://svn.opensuse.org/viewcvs/yast?rev=64720&view=rev Log: wagon - if the system is managed by SUSE Manager display a message and exit (fate#311994) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Mon Jul 4 13:38:03 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 4 11:28:46 UTC 2011 - lslezak(a)suse.cz + +- if the system is managed by SUSE Manager display a message + and exit (fate#311994) + +------------------------------------------------------------------- Fri Jul 1 11:11:48 UTC 2011 - lslezak(a)suse.cz - fixed help text in migration repository selection dialog Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp Mon Jul 4 13:38:03 2011 @@ -21,6 +21,7 @@ import "Popup"; import "Wagon"; import "Report"; + import "FileUtils"; textdomain "wagon"; @@ -41,6 +42,18 @@ GetInstArgs::enable_back(), GetInstArgs::enable_next()); Wizard::EnableAbortButton (); + // file /etc/sysconfig/rhn/systemid means the system is managed by SUSE Manager + if (FileUtils::Exists("/etc/sysconfig/rhn/systemid")) + { + y2milestone("File /etc/sysconfig/rhn/systemid found, aborting wagon"); + + // warning message, system managed by SUSE Manager cannot be migrated by wagon + // display this message and exit + Popup::Message(_("This system is managed by SUSE Manager,\nYaST wagon module cannot migrate systems managed by SUSE Manager.\n\nPress OK to exit.")); + + return (any)`back; + } + any ret = nil; while (true) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64719 - in /branches/SuSE-Code-11-SP1-Branch/iscsi-server: package/yast2-iscsi-server.changes src/helps.ycp src/widgets.ycp
by fehr＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: fehr Date: Mon Jul 4 12:48:13 2011 New Revision: 64719 URL: http://svn.opensuse.org/viewcvs/yast?rev=64719&view=rev Log: fix typos in translatable texts (bnc#703125) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes Mon Jul 4 12:48:13 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 30 16:16:50 CEST 2011 - fehr(a)suse.de + +- fix typos in translatable texts (bnc#703125) + +------------------------------------------------------------------- Mon May 16 11:29:53 CEST 2011 - fehr(a)suse.de - allow only integer values in lun input field (bnc#693683) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp Mon Jul 4 12:48:13 2011 @@ -38,7 +38,7 @@ "), - "save_configuration" : _("Save button will export some informations about + "save_configuration" : _("Save button will export some information about targets into selected file."), Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Mon Jul 4 12:48:13 2011 @@ -191,7 +191,7 @@ } else { - Popup::Warning(_("An error occured while saving the file.")); + Popup::Warning(_("An error occurred while saving the file.")); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64718 - in /trunk/ftp-server: package/yast2-ftp-server.changes src/dialogs.ycp src/ftp-server.ycp src/helps.ycp src/wid_functions.ycp
by snwint＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: snwint Date: Mon Jul 4 11:21:56 2011 New Revision: 64718 URL: http://svn.opensuse.org/viewcvs/yast?rev=64718&view=rev Log: - fixed typos (bnc #703104) Modified: trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/dialogs.ycp trunk/ftp-server/src/ftp-server.ycp trunk/ftp-server/src/helps.ycp trunk/ftp-server/src/wid_functions.ycp Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Mon Jul 4 11:21:56 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 4 11:21:08 CEST 2011 - snwint(a)suse.de + +- fixed typos (bnc #703104) + +------------------------------------------------------------------- Tue Feb 15 11:18:37 CET 2011 - jsrain(a)suse.cz - fixed command line interface - not polling UI while reading the Modified: trunk/ftp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/dialogs.ycp?rev=6… ============================================================================== --- trunk/ftp-server/src/dialogs.ycp (original) +++ trunk/ftp-server/src/dialogs.ycp Mon Jul 4 11:21:56 2011 @@ -869,7 +869,7 @@ result["items"] = [ ["disable", _("Disable SSL/&TLS")], ["accept", _("Accept &SSL and TLS")], - ["refuse", _("&Refuse Conections Without SSL/TLS")], + ["refuse", _("&Refuse Connections Without SSL/TLS")], ]; result["opt"] = [`notify]; result["init"] = InitSSL; Modified: trunk/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/ftp-server.ycp?re… ============================================================================== --- trunk/ftp-server/src/ftp-server.ycp (original) +++ trunk/ftp-server/src/ftp-server.ycp Mon Jul 4 11:21:56 2011 @@ -535,7 +535,7 @@ CommandLine::PrintNoCR(_("Anonymous and authenticated users")); } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Uknown option.")); + CommandLine::Error(_("Unknown option.")); CommandLine::Print(""); return false; } Modified: trunk/ftp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/helps.ycp?rev=647… ============================================================================== --- trunk/ftp-server/src/helps.ycp (original) +++ trunk/ftp-server/src/helps.ycp Mon Jul 4 11:21:56 2011 @@ -181,7 +181,7 @@ "AnonReadOnly": _("Anonymous Can Upload If enabled anonymous users will be permitted to upload. vsftpd only: If you want to allow anonymous users to upload, you -need an existing directory with write persmission in the home directory after login. +need an existing directory with write permission in the home directory after login. "), @@ -257,7 +257,7 @@ "SSL": _("Security Settings Disable SSL/TLS Disable SSL/TLS encryption layer. Accept SSL and TLS Accept both, traditional and encrypted sessions. -Refuse Conections Without SSL/TLS Refuse connections that do not use SSL/TLS security mechanisms, including anonymous sessions. +Refuse Connections Without SSL/TLS Refuse connections that do not use SSL/TLS security mechanisms, including anonymous sessions. "), /** Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Mon Jul 4 11:21:56 2011 @@ -941,7 +941,7 @@ for ") + FtpServer::anon_homedir +_("Upload (allow writing)?"); yesno_comment = _("If you want anonymous users to be able to create directories, - you need a directory with write acccess. + you need a directory with write access. "); yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64717 - in /trunk/dhcp-server: package/yast2-dhcp-server.changes src/dns-server-wizard.ycp
by snwint＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: snwint Date: Mon Jul 4 11:13:33 2011 New Revision: 64717 URL: http://svn.opensuse.org/viewcvs/yast?rev=64717&view=rev Log: - fixed typo (bnc #703097) Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes trunk/dhcp-server/src/dns-server-wizard.ycp Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-s… ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Mon Jul 4 11:13:33 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 4 11:12:40 CEST 2011 - snwint(a)suse.de + +- fixed typo (bnc #703097) + +------------------------------------------------------------------- Fri Apr 23 18:11:37 UTC 2010 - coolo(a)novell.com - reupdate the tar ball to fix build Modified: trunk/dhcp-server/src/dns-server-wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-wizar… ============================================================================== --- trunk/dhcp-server/src/dns-server-wizard.ycp (original) +++ trunk/dhcp-server/src/dns-server-wizard.ycp Mon Jul 4 11:13:33 2011 @@ -1066,7 +1066,7 @@ if (Popup::YesNo (sformat ( // TRANSLATORS: popup question, %1 is a list of errors - _("Errors occured during DNS zone creation: + _("Errors occurred during DNS zone creation: %1 Return to the wizard? -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64716 - /trunk/fcoe-client/agents/fcoe_cfg-ethx.scr
by gs＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: gs Date: Mon Jul 4 11:02:19 2011 New Revision: 64716 URL: http://svn.opensuse.org/viewcvs/yast?rev=64716&view=rev Log: agent not used Removed: trunk/fcoe-client/agents/fcoe_cfg-ethx.scr -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64715 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_cfg-ethx.scr
by gs＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: gs Date: Mon Jul 4 11:01:18 2011 New Revision: 64715 URL: http://svn.opensuse.org/viewcvs/yast?rev=64715&view=rev Log: agent not used Removed: branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_cfg-ethx.scr -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64714 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: FcoeClient.ycp fcoe-client.desktop fcoe-client_auto.ycp
by gs＠svn2.opensuse.org 04 Jul '11

04 Jul '11

Author: gs Date: Mon Jul 4 10:19:00 2011 New Revision: 64714 URL: http://svn.opensuse.org/viewcvs/yast?rev=64714&view=rev Log: support for AutoYaST added Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Mon Jul 4 10:19:00 2011 @@ -207,8 +207,8 @@ } // map containing information about start of services at boot -map <string, boolean> service_start = $[ "fcoe":false, - "lldpad":false ]; +map <string, boolean> service_start = $[ "fcoe":true, + "lldpad":true ]; // map containing information about networks cards and VLAN, FCoE and DCB status list <map> network_interfaces = []; @@ -470,7 +470,7 @@ global void SetStartStatus( string service, boolean status ) { - y2milestone( "Setting status of %1 to %2", service, status ); + y2milestone( "Starting service %1 on boot: %2", service, status ); service_start[ service ] = status; } @@ -900,7 +900,14 @@ */ global boolean Import (map settings) { - // TODO FIXME: your code here (fill the above mentioned variables)... + // fill variables + fcoe_general_config = (map <string, string>)settings["fcoe_cfg"]:$[ ]; + network_interfaces = (list <map>)settings["interfaces"]:[]; + service_start = (map <string, boolean>)settings["service_start"]:$[ ]; + + SetModified( true ); + y2milestone ("Configuration has been imported"); + return true; } @@ -911,8 +918,12 @@ */ global map Export () { - // TODO FIXME: your code here (return the above mentioned variables)... - return $[]; + // return map containing current settings + return $[ + "fcoe_cfg" : fcoe_general_config, + "interfaces" : network_interfaces, + "service_start" : service_start + ]; } /** @@ -921,9 +932,36 @@ */ global list Summary() { - // TODO FIXME: your code here... + string summary = ""; + map fcoe_config = $[]; + list <map> netcards = []; + map service_start = $[]; + /* Configuration summary text for autoyast */ - return [ _("Configuration summary..."), [] ]; + summary = Summary::AddLine( summary, _("General FCoE configuration") ); + fcoe_config = FcoeClient::GetFcoeConfig(); + // options from logfile, not meant for translation + summary = Summary::AddLine( summary, sformat( "DEBUG: %1", fcoe_config["DEBUG"]:"" ) ); + summary = Summary::AddLine( summary, sformat( "USE_SYSLOG: %1", fcoe_config["USE_SYSLOG"]:"" ) ); + summary = Summary::AddLine( summary, _("Interfaces") ); + netcards = FcoeClient::GetNetworkCards(); + foreach ( map card, netcards, { + summary = Summary::AddLine( summary, sformat( "%1: %2 %3: %4", + // network card, e.g. eth0 + _("Netcard:"), card["dev_name"]:"", + // nothing to translate here + "FCoE VLAN", card["fcoe_vlan"]:"") ); + + } ); + service_start = FcoeClient::GetStartStatus(); + summary = Summary::AddLine( summary, _("Starting of services") ); + + // starting of service "fcoe" at boot time is enabled or disabled + summary = Summary::AddLine( summary, sformat( "fcoe: %1", (service_start["fcoe"]:false)?_("enabled"):_("disabled") )); + // starting of service "lldpad" at boot time is enabled or disabled + summary = Summary::AddLine( summary, sformat( "lldpad: %1", (service_start["lldpad"]:false)?_("enabled"):_("disabled") ) ); + + return [ summary, [] ]; } /** @@ -943,8 +981,8 @@ */ global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; + // installation of open-fcoe required + return $[ "install":["open-fcoe"], "remove":[] ]; } /* EOF */ Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client.desktop Mon Jul 4 10:19:00 2011 @@ -11,10 +11,11 @@ X-SuSE-YaST-Group=Net_advanced X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true -X-SuSE-YaST-AutoInst= +X-SuSE-YaST-AutoInst=all X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=fcoe-client +X-SuSE-YaST-AutoInstClonable=true Icon=fcoe Exec=/sbin/yast2 fcoe-client Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp Mon Jul 4 10:19:00 2011 @@ -93,12 +93,57 @@ ret = FcoeClient::Read(); Progress::set (progress_orig); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; + boolean write = true; boolean progress_orig = Progress::set (false); - FcoeClient::SetWriteOnly (true); - ret = FcoeClient::Write(); + + // prepare for AutoYaST: check imported data and if required create the + // FCoE VLAN interfaces before calling FCoEClient::Write() + + list<map> netcards = FcoeClient::GetNetworkCards(); + foreach ( map card, netcards, { + string vlan_interface = ""; + string fcoe_vlan_interface = ""; + string command = ""; + map output = $[]; + + if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && + card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) + { + // create and start FcoE + command = sformat( "fipvlan -c -s %1", card["dev_name"]:"" ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + if ( output["exit"]:255 != 0 ) + { + y2error( "Cannot create and start FCoE on %1", card["dev_name"]:"" ); + write = false; // don't write configuration + } + else + { + // check FCoE VLAN interface + vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", + vlan_interface ); + if ( fcoe_vlan_interface != card["fcoe_vlan"]:"" ) + { + y2error( "FCoE VLAN interfaces differ. Created: %1, imported: %2", + fcoe_vlan_interface, card["fcoe_vlan"]:"" ); + write = false; // don't write configuration + } + } + } + }); + if ( write ) + { + ret = FcoeClient::Write(); + } + else // don't continue in case of error + { + ret = false; + } Progress::set (progress_orig); } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0