July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64783 - in /branches/SuSE-Code-11-SP1-Branch/mail: agents/setup_dkim_verifying.pl src/Mail.ycp src/ui.ycp
by varkoly＠svn2.opensuse.org 12 Jul '11

12 Jul '11

Author: varkoly Date: Tue Jul 12 16:54:06 2011 New Revision: 64783 URL: http://svn.opensuse.org/viewcvs/yast?rev=64783&view=rev Log: Code clean up. Remove senceles tests Create the directory /var/db/dkim/ Modified: branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp Modified: branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl Tue Jul 12 16:54:06 2011 @@ -15,7 +15,7 @@ #Generate the key if( ! -e "/var/db/dkim/$DOMAIN.pem" ){ print "Creating /var/db/dkim/$DOMAIN.pem\n"; - system( "amavisd genrsa /var/db/dkim/$DOMAIN.pem"); + system( "mkdir -p /var/db/dkim/; amavisd genrsa /var/db/dkim/$DOMAIN.pem;"); } #Introduce key into /etc/amavisd.conf Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp Tue Jul 12 16:54:06 2011 @@ -79,7 +79,7 @@ /** * Use a virus scanner (AMaViS). * amavisd-new (mta-independent) must be installed. - * It will be installed if amavis_allowed and it is not installed. + * It will be installed if is not installed. */ global boolean use_amavis = false; @@ -89,10 +89,6 @@ */ global boolean use_dkim = false; - /** - * Is amavis available on the installation media? - */ - global boolean amavis_allowed = true; /** * Domains for locally delivered mail. @@ -273,24 +269,8 @@ if (! Package::Installed ("clamav")) { - // #115295 - // Amavis alone will block incoming mail if no scanner is found - // We ship clamav but not on opensuse - // Clamav can work without clamav-db.rpm if set up manually - // so we do not check Installed "clamav-db" - y2milestone ("clamav not installed"); - if (! Package::AvailableAll (["clamav", "clamav-db"])) - { - // error popup. - Report::Error (_("AMaViS needs a virus scanner such as ClamAV -to do the actual scanning, but ClamAV was not found. -Configure a scanner manually.")); - } - else - { - install_packages = add (install_packages, "clamav"); - install_packages = add (install_packages, "clamav-db"); - } + install_packages = add (install_packages, "clamav"); + message = message + _("ClamAV, a virus scanner engine, will be installed.\n"); } } @@ -432,12 +412,8 @@ } // amavis - string amavis_pkg = "amavisd-new"; - amavis_allowed = PackageSystem::Installed (amavis_pkg) || - Mode::commandline (); - // || PackageSystem::Available (amavis_pkg); - use_amavis = amavis_allowed && (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes"); - use_dkim = use_amavis && (SCR::Read (.sysconfig.amavis.USE_DKIM) == "yes"); + use_amavis = (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes"); + use_dkim = use_amavis && (SCR::Read (.sysconfig.amavis.USE_DKIM) == "yes"); // local_domains string ld_s = ""; @@ -661,7 +637,6 @@ create_config = true; listen_remote = true; connection_type = `dialup; - amavis_allowed = true; use_amavis = true; use_dkim = true; // good example? Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp Tue Jul 12 16:54:06 2011 @@ -256,22 +256,10 @@ ) ); - boolean amavis_allowed = Mail::amavis_allowed; - - term amavis_t = nil; - term dkim_t = nil; - if (amavis_allowed) - { - amavis_t = `Left (WJ_MakeWidget (`use_amavis)); - widgets = add (widgets, `use_amavis); - dkim_t = `Left (WJ_MakeWidget (`use_dkim)); - widgets = add (widgets, `use_dkim); - } - else - { - amavis_t = `Empty (`id (`use_amavis)); - dkim_t = `Empty (`id (`use_dkim)); - } + term amavis_t = `Left (WJ_MakeWidget (`use_amavis)); + widgets = add (widgets, `use_amavis); + term dkim_t = `Left (WJ_MakeWidget (`use_dkim)); + widgets = add (widgets, `use_dkim); contents = `HSquash ( `VBox ( -- 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] r64782 - /tags/branch-Code-11-SP2-2_17_87/installation/
by jsuchome＠svn2.opensuse.org 12 Jul '11

12 Jul '11

Author: jsuchome Date: Tue Jul 12 15:36:43 2011 New Revision: 64782 URL: http://svn.opensuse.org/viewcvs/yast?rev=64782&view=rev Log: Created tag branch-Code-11-SP2-2_17_87 for installation Added: tags/branch-Code-11-SP2-2_17_87/installation/ (props changed) - copied from r64781, branches/SuSE-Code-11-SP2-Branch/installation/ -- 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] r64781 - /tags/branch-Code-11-SP2-2_17_87/
by jsuchome＠svn2.opensuse.org 12 Jul '11

12 Jul '11

Author: jsuchome Date: Tue Jul 12 15:36:42 2011 New Revision: 64781 URL: http://svn.opensuse.org/viewcvs/yast?rev=64781&view=rev Log: Created tag branch-Code-11-SP2-2_17_87 Added: tags/branch-Code-11-SP2-2_17_87/ -- 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] r64780 - in /branches/SuSE-Code-11-SP2-Branch/installation: VERSION package/yast2-installation.changes src/clients/inst_scenarios.ycp
by jsuchome＠svn2.opensuse.org 12 Jul '11

12 Jul '11

Author: jsuchome Date: Tue Jul 12 15:36:37 2011 New Revision: 64780 URL: http://svn.opensuse.org/viewcvs/yast?rev=64780&view=rev Log: - Show Xen Virtualization Host Server Installation scenario only for x86_64 architecture (bnc#702103) - 2.17.87 Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_scenarios.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Tue Jul 12 15:36:37 2011 @@ -1 +1 @@ -2.17.86 +2.17.87 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Tue Jul 12 15:36:37 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 12 13:50:06 CEST 2011 - jsuchome(a)suse.cz + +- Show Xen Virtualization Host Server Installation scenario + only for x86_64 architecture (bnc#702103) +- 2.17.87 + +------------------------------------------------------------------- Fri Jul 1 15:40:04 CEST 2011 - locilka(a)suse.cz - backported fixes for user-input handling in inst_proposal Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_scenarios.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_scenarios.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_scenarios.ycp Tue Jul 12 15:36:37 2011 @@ -12,6 +12,7 @@ textdomain "installation"; + import "Arch"; import "ProductControl"; import "ProductFeatures"; import "Wizard"; @@ -41,6 +42,16 @@ list <map <string, string> > system_scenarios = (list <map <string, string> >) any_scenarios; + // Remove Xen Virtualization Host Server Installation for non-x86_64 (bnc#702103) + system_scenarios = filter (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" == "scenario_virtualization_host" && !Arch::x86_64 ()) + { + y2milestone ("removing Xen Virtualization Host Server option"); + return false; + } + return true; + }); + /** * Adjusts UI - selected radio button */ -- 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] r64779 - /tags/stable-2_21_7/installation/
by jsuchome＠svn2.opensuse.org 12 Jul '11

12 Jul '11

Author: jsuchome Date: Tue Jul 12 15:35:35 2011 New Revision: 64779 URL: http://svn.opensuse.org/viewcvs/yast?rev=64779&view=rev Log: Created tag stable-2_21_7 for installation Added: tags/stable-2_21_7/installation/ - copied from r64778, trunk/installation/ -- 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] r64778 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_scenarios.ycp
by jsuchome＠svn2.opensuse.org 12 Jul '11

12 Jul '11

Author: jsuchome Date: Tue Jul 12 15:35:23 2011 New Revision: 64778 URL: http://svn.opensuse.org/viewcvs/yast?rev=64778&view=rev Log: - Show Xen Virtualization Host Server Installation scenario only for x86_64 architecture (bnc#702103) - 2.21.7 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_scenarios.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=64778&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Jul 12 15:35:23 2011 @@ -1 +1 @@ -2.21.6 +2.21.7 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jul 12 15:35:23 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 12 15:34:38 CEST 2011 - jsuchome(a)suse.cz + +- Show Xen Virtualization Host Server Installation scenario + only for x86_64 architecture (bnc#702103) +- 2.21.7 + +------------------------------------------------------------------- Thu Jun 30 14:09:17 CEST 2011 - jsuchome(a)suse.cz - fixed typos (bnc#703119) Modified: trunk/installation/src/clients/inst_scenarios.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sc… ============================================================================== --- trunk/installation/src/clients/inst_scenarios.ycp (original) +++ trunk/installation/src/clients/inst_scenarios.ycp Tue Jul 12 15:35:23 2011 @@ -12,6 +12,7 @@ textdomain "installation"; + import "Arch"; import "ProductControl"; import "ProductFeatures"; import "Wizard"; @@ -41,6 +42,16 @@ list <map <string, string> > system_scenarios = (list <map <string, string> >) any_scenarios; + // Remove Xen Virtualization Host Server Installation for non-x86_64 (bnc#702103) + system_scenarios = filter (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" == "scenario_virtualization_host" && !Arch::x86_64 ()) + { + y2milestone ("removing Xen Virtualization Host Server option"); + return false; + } + return true; + }); + /** * Adjusts UI - selected radio button */ -- 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] r64777 - /trunk/squidguard/src/dialogs.ycp
by lrupp＠svn2.opensuse.org 11 Jul '11

11 Jul '11

Author: lrupp Date: Mon Jul 11 21:05:21 2011 New Revision: 64777 URL: http://svn.opensuse.org/viewcvs/yast?rev=64777&view=rev Log: - switch from HBox to ButtonBox as requested in bnc#701272 Modified: trunk/squidguard/src/dialogs.ycp Modified: trunk/squidguard/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squidguard/src/dialogs.ycp?rev=6… ============================================================================== --- trunk/squidguard/src/dialogs.ycp (original) +++ trunk/squidguard/src/dialogs.ycp Mon Jul 11 21:05:21 2011 @@ -96,7 +96,7 @@ `VSpacing (0.5), // textentry label `TextEntry (`id (`url), _("&Modify URL"), current), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok),`opt(`key_F10, `default), Label::OKButton()), `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton()) ), @@ -165,7 +165,7 @@ UI::OpenDialog (`opt(`decorated), `HBox (`HSpacing (0.5), `VBox ( `VSpacing (0.5), `TextEntry (`id (`url), label), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok),`opt(`key_F10, `default), Label::OKButton()), `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton()) ), -- 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] r64776 - /tags/stable-2_21_2/country/
by jsuchome＠svn2.opensuse.org 11 Jul '11

11 Jul '11

Author: jsuchome Date: Mon Jul 11 16:49:02 2011 New Revision: 64776 URL: http://svn.opensuse.org/viewcvs/yast?rev=64776&view=rev Log: Created tag stable-2_21_2 for country Added: tags/stable-2_21_2/country/ - copied from r64775, trunk/country/ -- 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] r64775 - in /trunk/country: VERSION keyboard/src/modules/Keyboard.ycp package/yast2-country.changes
by jsuchome＠svn2.opensuse.org 11 Jul '11

11 Jul '11

Author: jsuchome Date: Mon Jul 11 16:48:56 2011 New Revision: 64775 URL: http://svn.opensuse.org/viewcvs/yast?rev=64775&view=rev Log: - avoid a pop-up during unattended upgrade (bnc#704078) - 2.21.2 Modified: trunk/country/VERSION trunk/country/keyboard/src/modules/Keyboard.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=64775&r1=647… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Jul 11 16:48:56 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/country/keyboard/src/modules/Keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/modules/Key… ============================================================================== --- trunk/country/keyboard/src/modules/Keyboard.ycp (original) +++ trunk/country/keyboard/src/modules/Keyboard.ycp Mon Jul 11 16:48:56 2011 @@ -1338,6 +1338,12 @@ */ global define void CheckKeyboardDuringUpdate (string destdir) { + // autoupgrade is not interactive, therefore skip this check and use data + // from profile directly + if (Mode::autoupgrade()) { + return; + } + string target_kbd = Misc::CustomSysconfigRead ( "YAST_KEYBOARD", current_kbd, destdir + "/etc/sysconfig/keyboard"); integer pos = find (target_kbd, ","); Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Jul 11 16:48:56 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 11 16:39:42 CEST 2011 - jsuchome(a)suse.cz + +- avoid a pop-up during unattended upgrade (bnc#704078) +- 2.21.2 + +------------------------------------------------------------------- Fri Jun 24 10:17:00 CEST 2011 - jsuchome(a)suse.cz - use ButtonBox when appropriate (bnc#701260) -- 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] r64774 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: FcoeClient.ycp fcoe-client_auto.ycp
by gs＠svn2.opensuse.org 08 Jul '11

08 Jul '11

Author: gs Date: Fri Jul 8 14:06:31 2011 New Revision: 64774 URL: http://svn.opensuse.org/viewcvs/yast?rev=64774&view=rev Log: improvements/bugfixes AutoYaST - start FCoE on all capable interfaces (numeration may differ) Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp 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 Fri Jul 8 14:06:31 2011 @@ -634,7 +634,7 @@ global boolean ReadFcoeConfig() { list <string> options = (list<string>) SCR::Dir(.fcoe); - y2milestone( "List of options: %1", options ); + y2debug( "List of options: %1", options ); if ( options == [] || options == nil ) return false; @@ -645,6 +645,8 @@ string syslog_val = (string)SCR::Read(add(.fcoe, "USE_SYSLOG")); fcoe_general_config = add( fcoe_general_config, "USE_SYSLOG", syslog_val ); + y2milestone( "/etc/fcoe/config read - DEBUG: %1, USE_SYSLOG: %2", debug_val, syslog_val ); + return true; } @@ -683,7 +685,7 @@ card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED && Modified() ) // and data are modified { string content = (string)SCR::Read( .target.string, card["cfg_file"]:"" ); - y2milestone( "Original content of %1: %2", card["cfg_file"]:"", content ); + y2debug( "Original content of %1: %2", card["cfg_file"]:"", content ); list <string> lines = (list<string>)splitstring( content, "\n" ); lines = maplist( string line, lines, { @@ -701,7 +703,7 @@ } }); content = mergestring( lines, "\n" ); - y2milestone( "Modified content: %1", content ); + y2milestone( "Writing content: %1", content ); boolean ret = SCR::Write( .target.string, card["cfg_file"]:"", content ); if ( !ret ) @@ -714,10 +716,6 @@ y2milestone( "%1 written", card["cfg_file"]:"" ); } } - else - { - y2milestone( "%1 not configured for FCoE", card["dev_name"]:"" ); - } } ); return success; @@ -964,16 +962,12 @@ summary = Summary::AddLine( summary, _("Interfaces") ); netcards = FcoeClient::GetNetworkCards(); foreach ( map card, netcards, { - summary = Summary::AddLine( summary, sformat( "%1: %2 %3: %4 %5: %6 %7: %8", + summary = Summary::AddLine( summary, sformat( "%1: %2 %3: %4", // network card, e.g. eth0 _("Netcard:"), card["dev_name"]:"", // nothing to translate here (abbreviation for // Fibre Channel over Ethernet Virtual LAN interface) - "FCoE VLAN", card["fcoe_vlan"]:"", - // nothing to translate, options from config file - "FCOE_ENABLE", card["fcoe_enable"]:"", - "DCB_REQUIRED", card["dcb_required"]:"" ) ); - + "FCoE VLAN", card["fcoe_vlan"]:"" ) ); } ); service_start = FcoeClient::GetStartStatus(); summary = Summary::AddLine( summary, _("Starting of services") ); 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 Fri Jul 8 14:06:31 2011 @@ -96,86 +96,139 @@ /* Write given settings */ else if (func == "Write") { import "Progress"; - boolean write = true; boolean progress_orig = Progress::set (false); - // prepare for AutoYaST: check imported data and if required create the - // FCoE VLAN interfaces before calling FCoEClient::Write() - - list<map> netcards = FcoeClient::GetNetworkCards(); - y2milestone( "Netcards: %1", netcards ); + boolean success = true; + boolean start_fcoe = false; + list<map> detected_netcards = []; + integer index = 0; - foreach ( map card, netcards, { - string vlan_interface = ""; - string fcoe_vlan_interface = ""; - string command = ""; - map output = $[]; - string ifcfg_file = ""; - - if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && - card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) - { - ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", card["dev_name"]:"", card["vlan_interface"]:"" ); - - // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists - // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) - if ( FileUtils::Exists( ifcfg_file ) ) - { - command = sformat( "ifup %1\.%2", card["dev_name"]:"", card["vlan_interface"]:"" ); - y2milestone( "Executing command: %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); + // prepare for AutoYaST + list<map> imported_netcards = FcoeClient::GetNetworkCards(); + y2milestone( "Imported information about netcards: %1", imported_netcards ); + + // AutoYaST will install package 'open-fcoe' ( checks AutoPackages() ) - if ( output["exit"]:255 == 0 ) - { - // start FCoE - command = sformat( "fipvlan -s %1", card["dev_name"]:"" ); - } - } - else // create VLAN interface and start FCoE + // Start services 'fcoe' and 'lldpad' + success = FcoeClient::ServiceStatus(); + if ( success ) + { + y2milestone( "Services fcoe and lldpad started" ); + } + else + { + y2error( "Cannot start services - stopping auto installation" ); + return false; + } + // Reset info about netcards and get current values + FcoeClient::ResetNetworkCards(); + success = FcoeClient::DetectNetworkCards(); + if ( success ) + { + detected_netcards = FcoeClient::GetNetworkCards(); + y2milestone( "Information about detected netcards: %1", detected_netcards ); + } + else + { + y2error( "Cannot detect network cards - stopping auto installation" ); + return false; + } + + // Check imported data + foreach ( map card, imported_netcards, { + if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && + card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) { - command = sformat( "fipvlan -c -s %1", card["dev_name"]:"" ); - y2milestone( "Executing command: %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); + // any FCoE VLAN interface is configured + start_fcoe = true; } - - 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 - } - else + } ); + + // If any FcoE interface is found in imported data we try to start FCoE + // for all interfaces which are not yet configured, i.e. where starting of + // FCoE is possible. We can not start exactly the interface from imported + // data because the numeration of interfaces (eth0, eth1...) may differ. + if ( start_fcoe ) + { + foreach ( map card, detected_netcards, { + string vlan_interface = ""; + string fcoe_vlan_interface = ""; + string command = ""; + map output = $[]; + string ifcfg_file = ""; + map status_map = $[]; + + if ( card["fcoe_vlan"]:"" == FcoeClient::NOT_CONFIGURED ) { - // read or create /etc/fcoe/ethx file - FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - } - } - } - }); + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", card["dev_name"]:"", + card["vlan_interface"]:"" ); + // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists + // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) + if ( FileUtils::Exists( ifcfg_file ) ) + { + command = sformat( "ifup %1\.%2", card["dev_name"]:"", card["vlan_interface"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); - if ( write ) - { - // FcoeClient::SetModified(true) is called in FcoeClient::Import(), - // i.e. modified is set before calling FcoeClient::Write() - ret = FcoeClient::Write(); - } - else // don't continue in case of error - { - ret = false; + if ( output["exit"]:255 == 0 ) + { + // start FCoE + command = sformat( "fipvlan -s %1", card["dev_name"]:"" ); + } + } + else // create VLAN interface and start FCoE + { + command = sformat( "fipvlan -c -s %1", card["dev_name"]:"" ); + y2milestone( "Executing command: %1", command ); + 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"]:"" ); + } + else // get FCoE VLAN interface + { + vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); + if ( vlan_interface == "" ) + { + y2error( "VLAN interface not available for %1.", card["dev_name"]:"" ); + } + else + { + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", + vlan_interface ); + if ( fcoe_vlan_interface != "" ) + { + y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); + // read or create /etc/fcoe/ethx file + status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); + // apply modified data + detected_netcards[ index, "fcoe_vlan"] = fcoe_vlan_interface; + detected_netcards[ index, "cfg_file"] = status_map["Filename"]:""; + detected_netcards[ index, "fcoe_enable"] = status_map["FCOE_ENABLE"]:""; + detected_netcards[ index, "dcb_required"] = status_map["DCB_REQUIRED"]:""; + } + else + { + y2error( "FCoE VLAN interface not configured for %1", card["dev_name"]:"" ); + } + } + } + } + index = index + 1; + }); } + y2milestone( "Set NEW information about network cards: %1", detected_netcards ); + // Set new information about netcards + FcoeClient::SetNetworkCards( detected_netcards ); + + // FcoeClient::SetModified(true) is called in FcoeClient::Import(), + // i.e. modified is set before calling FcoeClient::Write() + ret = FcoeClient::Write(); + 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