June 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64653 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_automatic_configuration.ycp src/inst_finish/save_config_finish.ycp src/modules/ImageInstallation.ycp
by jsuchome＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: jsuchome Date: Thu Jun 30 14:13:47 2011 New Revision: 64653 URL: http://svn.opensuse.org/viewcvs/yast?rev=64653&view=rev Log: - fixed typos (bnc#703119) - 2.21.6 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_automatic_configuration.ycp trunk/installation/src/inst_finish/save_config_finish.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=64653&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Jun 30 14:13:47 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 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 Thu Jun 30 14:13:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 30 14:09:17 CEST 2011 - jsuchome(a)suse.cz + +- fixed typos (bnc#703119) +- 2.21.6 + +------------------------------------------------------------------- Wed Jun 1 17:24:25 CEST 2011 - locilka(a)suse.cz - always loading 'pciehp' kernel module on Dell hardware Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_au… ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Thu Jun 30 14:13:47 2011 @@ -223,7 +223,7 @@ Wizard::OpenNextBackStepsDialog(); DumpACUIError(); InstError::ShowErrorPopupWithLogs ( - sformat (_("An error has occured while calling '%1' AC script."), last_client) + sformat (_("An error has occurred while calling '%1' AC script."), last_client) ); } @@ -235,7 +235,7 @@ DumpACUIError(); y2error ("There is no Automatic Configuration dialog, adjusting the current one..."); InstError::ShowErrorPopupWithLogs ( - sformat (_("An error has occured while calling '%1' AC script."), last_client) + sformat (_("An error has occurred while calling '%1' AC script."), last_client) ); } Modified: trunk/installation/src/inst_finish/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/sav… ============================================================================== --- trunk/installation/src/inst_finish/save_config_finish.ycp (original) +++ trunk/installation/src/inst_finish/save_config_finish.ycp Thu Jun 30 14:13:47 2011 @@ -131,7 +131,7 @@ { Progress::NextStep (); // progress step title - Progress::Title (_("Saving automatical installation settings...")); + Progress::Title (_("Saving automatic installation settings...")); AutoInstall::Save(); } Progress::NextStep (); Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Thu Jun 30 14:13:47 2011 @@ -1233,14 +1233,14 @@ } // Error message - Report::Error (_("Installation was unable to solve package dependecies automatically. + Report::Error (_("Installation was unable to solve package dependencies automatically. Package manager will be opened for you to solve them manually.")); boolean ret = false; // BNC #Trying to solve deps. manually while (true) { - y2warning ("Cannot solve dependecies automatically, opening Packages UI"); + y2warning ("Cannot solve dependencies automatically, opening Packages UI"); symbol diaret = PackagesUI::RunPackageSelector ($["enable_repo_mgr":false, "mode":`summaryMode]); y2milestone ("RunPackageSelector returned %1", diaret); -- 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] r64652 - /trunk/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: gs Date: Thu Jun 30 13:47:38 2011 New Revision: 64652 URL: http://svn.opensuse.org/viewcvs/yast?rev=64652&view=rev Log: better logging Modified: trunk/fcoe-client/src/FcoeClient.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Thu Jun 30 13:47:38 2011 @@ -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; } -- 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] r64651 - /trunk/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: gs Date: Thu Jun 30 13:47:22 2011 New Revision: 64651 URL: http://svn.opensuse.org/viewcvs/yast?rev=64651&view=rev Log: SetStartStatus() called correctly Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Thu Jun 30 13:47:22 2011 @@ -100,8 +100,8 @@ FcoeClient::RestartServiceFcoe(); // enable start of services y2milestone( "Enabling service start of fcoe and lldpad" ); - FcoeClient::SetStartService( "fcoe", true ); - FcoeClient::SetStartService( "lldpad", true ); + FcoeClient::SetStartStatus( "fcoe", true ); + FcoeClient::SetStartStatus( "lldpad", true ); FcoeClient::AdjustStartStatus(); // reset modified flag FcoeClient::SetModified( false ); -- 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] r64650 - in /trunk/iscsi-server: VERSION package/yast2-iscsi-server.changes src/helps.ycp src/widgets.ycp
by fehr＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: fehr Date: Thu Jun 30 13:39:06 2011 New Revision: 64650 URL: http://svn.opensuse.org/viewcvs/yast?rev=64650&view=rev Log: - fix typos in stranlatable texts (bnc#703125) - 2.21.2 Modified: trunk/iscsi-server/VERSION trunk/iscsi-server/package/yast2-iscsi-server.changes trunk/iscsi-server/src/helps.ycp trunk/iscsi-server/src/widgets.ycp Modified: trunk/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/VERSION?rev=64650&r… ============================================================================== --- trunk/iscsi-server/VERSION (original) +++ trunk/iscsi-server/VERSION Thu Jun 30 13:39:06 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-server/package/yast2-iscsi-server.changes (original) +++ trunk/iscsi-server/package/yast2-iscsi-server.changes Thu Jun 30 13:39:06 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 30 13:37:59 CEST 2011 - fehr(a)suse.de + +- fix typos in stranlatable texts (bnc#703125) +- 2.21.2 + +------------------------------------------------------------------- Mon May 16 11:29:53 CEST 2011 - fehr(a)suse.de - allow only integer values in lun input field (bnc#693683) Modified: trunk/iscsi-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/helps.ycp?rev=6… ============================================================================== --- trunk/iscsi-server/src/helps.ycp (original) +++ trunk/iscsi-server/src/helps.ycp Thu Jun 30 13:39:06 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: trunk/iscsi-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-server/src/widgets.ycp (original) +++ trunk/iscsi-server/src/widgets.ycp Thu Jun 30 13:39:06 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] r64649 - /trunk/fcoe-client/src/fcoe-client_auto.ycp
by gs＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: gs Date: Thu Jun 30 13:28:37 2011 New Revision: 64649 URL: http://svn.opensuse.org/viewcvs/yast?rev=64649&view=rev Log: don't set SetStartService to true, use imported values Modified: trunk/fcoe-client/src/fcoe-client_auto.ycp Modified: trunk/fcoe-client/src/fcoe-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/fcoe-client_auto… ============================================================================== --- trunk/fcoe-client/src/fcoe-client_auto.ycp (original) +++ trunk/fcoe-client/src/fcoe-client_auto.ycp Thu Jun 30 13:28:37 2011 @@ -138,10 +138,6 @@ }); if ( write ) { - // set service start 'true' (start status is adjusted in FcoeClient::Write) - FcoeClient::SetStartService( "fcoe", true ); - FcoeClient::SetStartService( "lldpad", true ); - ret = FcoeClient::Write(); } else // don't continue in case of error -- 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] r64648 - /trunk/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: gs Date: Thu Jun 30 13:27:26 2011 New Revision: 64648 URL: http://svn.opensuse.org/viewcvs/yast?rev=64648&view=rev Log: fill summary, add service_start to Import/Export map Modified: trunk/fcoe-client/src/FcoeClient.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Thu Jun 30 13:27:26 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 = []; @@ -901,9 +901,10 @@ global boolean Import (map settings) { // fill variables - fcoe_general_config = (map <string, string>)settings["fcoe_cfg"]:$[ "DEBUG":"no", "USE_SYSLOG":"yes" ]; + 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"); @@ -920,7 +921,8 @@ // return map containing current settings return $[ "fcoe_cfg" : fcoe_general_config, - "interfaces" : network_interfaces + "interfaces" : network_interfaces, + "service_start" : service_start ]; } @@ -930,9 +932,33 @@ */ 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(); + 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") ); + summary = Summary::AddLine( summary, sformat( "fcoe: %1", (service_start["fcoe"]:false)?"true":"false" ) ); + summary = Summary::AddLine( summary, sformat( "lldpad: %1", (service_start["lldpad"]:false)?"true":"false" ) ); + + + return [ summary, [] ]; } /** -- 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] r64647 - in /trunk/qt-pkg: ./ package/ src/
by tgoettlicher＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: tgoettlicher Date: Thu Jun 30 13:10:23 2011 New Revision: 64647 URL: http://svn.opensuse.org/viewcvs/yast?rev=64647&view=rev Log: - Fixed theme/color palette handling (bnc #637294) - 2.21.4 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelectorHelp.cc trunk/qt-pkg/src/YQPkgConflictList.cc trunk/qt-pkg/src/YQPkgGenericDetailsView.cc trunk/qt-pkg/src/YQPkgSelDescriptionView.cc trunk/qt-pkg/src/YQPkgTextDialog.cc trunk/qt-pkg/src/YQPkgVersionsView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=64647&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Jun 30 13:10:23 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "4") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Jun 30 13:10:23 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 30 13:09:17 CEST 2011 - tgoettlicher(a)suse.de + +- Fixed theme/color palette handling (bnc #637294) +- 2.21.4 + +------------------------------------------------------------------- Fri May 27 11:42:51 CEST 2011 - tgoettlicher(a)suse.de - Fixed typo (bnc #696514) Modified: trunk/qt-pkg/src/YQPackageSelectorHelp.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelectorHelp… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelectorHelp.cc (original) +++ trunk/qt-pkg/src/YQPackageSelectorHelp.cc Thu Jun 30 13:10:23 2011 @@ -41,6 +41,7 @@ /-*/ #include <qstring.h> +#include <qapplication.h> #define YUILogComponent "qt-pkg" #include "YUILog.h" @@ -340,7 +341,9 @@ { QString html = "<tr valign='top'>"; html += - "<td><table bgcolor='#E0E0E0'><tr><td align='center'>" + "<td><table bgcolor='" + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + "'><tr><td align='center'>" + key + "</td></tr></table></td>" + "<td>" + summary + "</td>" Modified: trunk/qt-pkg/src/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgConflictList.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgConflictList.cc (original) +++ trunk/qt-pkg/src/YQPkgConflictList.cc Thu Jun 30 13:10:23 2011 @@ -267,7 +267,9 @@ { QFrame * frame = new QFrame( this ); frame->setProperty( "class", "conflict-frame" ); - frame->setStyleSheet( "background-color: lightgray;" ); + frame->setStyleSheet( "background-color: " + + QApplication::palette().color( QPalette::Active, QPalette::Base ).name() + + ";" ); QHBoxLayout * hbox = new QHBoxLayout( frame ); Modified: trunk/qt-pkg/src/YQPkgGenericDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgGenericDetailsVi… ============================================================================== --- trunk/qt-pkg/src/YQPkgGenericDetailsView.cc (original) +++ trunk/qt-pkg/src/YQPkgGenericDetailsView.cc Thu Jun 30 13:10:23 2011 @@ -68,7 +68,9 @@ "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif ;" "font-weight: normal;" "font-size: small;" - ";color: #fff;" + ";color: " + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + ";" "width: 100%;" "" "border: 1px;" @@ -77,17 +79,25 @@ "" "table.stats td" "{" - ";color: #000;" + ";color: " + + QApplication::palette().color( QPalette::Active, QPalette::WindowText).name() + + ";" "padding: 4px;" "text-align: left;" - "border: 1px #fff solid;}" + "border: 1px " + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + " solid;}" "" "table.stats td.hed" "{" - ";color: #fff;" + ";color: " + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + ";" "padding: 4px;" "text-align: left;" - "border-bottom: 2px #fff solid;" + "border-bottom: 2px " + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + " solid;" "font-size: small;" "font-weight: bold;} "; @@ -256,10 +266,15 @@ QString YQPkgGenericDetailsView::hcell( QString contents ) { + + + QString html = "<td"; if ( ! YQUI::ui()->usingVisionImpairedPalette() ) - html += " bgcolor=#D0D0D0"; + html += " bgcolor=\"" + + QApplication::palette().color( QPalette::Active, QPalette::Window).name() + + "\""; html += ">" + contents + "</td>"; Modified: trunk/qt-pkg/src/YQPkgSelDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSelDescriptionVi… ============================================================================== --- trunk/qt-pkg/src/YQPkgSelDescriptionView.cc (original) +++ trunk/qt-pkg/src/YQPkgSelDescriptionView.cc Thu Jun 30 13:10:23 2011 @@ -156,7 +156,9 @@ QString html = "<table width='100%'"; if ( ! YQUI::ui()->usingVisionImpairedPalette() ) - html += " bgcolor='#C8C8F8'"; // or #E0E0F8 (very light blueish grey) + html += " bgcolor='" + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + "'"; html += "><tr><td>" + ( useBigFont ? QString( "<h2>" ) : QString( "" ) ) Modified: trunk/qt-pkg/src/YQPkgTextDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgTextDialog.cc?re… ============================================================================== --- trunk/qt-pkg/src/YQPkgTextDialog.cc (original) +++ trunk/qt-pkg/src/YQPkgTextDialog.cc Thu Jun 30 13:10:23 2011 @@ -51,6 +51,7 @@ #include <QKeyEvent> #include <QBoxLayout> #include <QEvent> +#include <QApplication> #include "YQPkgTextDialog.h" @@ -312,7 +313,9 @@ YQPkgTextDialog::htmlHeading( const QString & text ) { QString html = - "<table bgcolor=#E0E0F8><tr><td>" + "<table bgcolor=" + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + "><tr><td>" + text + "</td></tr></table> "; @@ -334,7 +337,9 @@ QString summary = fromUTF8( zyppObj->summary() ); QString html = - "<table bgcolor=#E0E0F8><tr><td>" + "<table bgcolor=" + + QApplication::palette().color( QPalette::Active, QPalette::Base).name() + + "><tr><td>" + fromUTF8( zyppObj->name() ) + ""; Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Thu Jun 30 13:10:23 2011 @@ -49,6 +49,7 @@ #include <QHeaderView> #include <QStylePainter> #include <QStyleOptionButton> +#include <QApplication> #include "YQPkgVersionsView.h" @@ -144,10 +145,10 @@ _content->setLayout( _layout ); // also paint the scrollarea background - setPalette( QPalette( Qt::white ) ); + setPalette( QApplication::palette().color( QPalette::Active, QPalette::Base ) ); setAutoFillBackground( true ); - _content->setPalette( QPalette( Qt::white ) ); + _content->setPalette( QApplication::palette().color( QPalette::Active, QPalette::Base ) ); _content->setAutoFillBackground( true ); QLabel * pkgNameLabel = new QLabel( this ); -- 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] r64646 - /trunk/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: gs Date: Thu Jun 30 12:21:50 2011 New Revision: 64646 URL: http://svn.opensuse.org/viewcvs/yast?rev=64646&view=rev Log: use FcoeClient func to set start stati Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Thu Jun 30 12:21:50 2011 @@ -100,8 +100,9 @@ FcoeClient::RestartServiceFcoe(); // enable start of services y2milestone( "Enabling service start of fcoe and lldpad" ); - Service::Enable("fcoe"); - Service::Enable("lldpad"); + FcoeClient::SetStartService( "fcoe", true ); + FcoeClient::SetStartService( "lldpad", true ); + FcoeClient::AdjustStartStatus(); // reset modified flag FcoeClient::SetModified( false ); } -- 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] r64645 - /trunk/fcoe-client/src/fcoe-client_auto.ycp
by gs＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: gs Date: Thu Jun 30 12:21:25 2011 New Revision: 64645 URL: http://svn.opensuse.org/viewcvs/yast?rev=64645&view=rev Log: set start stati to true Modified: trunk/fcoe-client/src/fcoe-client_auto.ycp Modified: trunk/fcoe-client/src/fcoe-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/fcoe-client_auto… ============================================================================== --- trunk/fcoe-client/src/fcoe-client_auto.ycp (original) +++ trunk/fcoe-client/src/fcoe-client_auto.ycp Thu Jun 30 12:21:25 2011 @@ -93,13 +93,15 @@ 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); - // prepare for AutoYaST + + // 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 = ""; @@ -127,7 +129,7 @@ vlan_interface ); if ( fcoe_vlan_interface != card["fcoe_vlan"]:"" ) { - y2error( "FCoE VLAN interface not correct - created: %1, imported: %2", + y2error( "FCoE VLAN interfaces differ. Created: %1, imported: %2", fcoe_vlan_interface, card["fcoe_vlan"]:"" ); write = false; // don't write configuration } @@ -136,6 +138,10 @@ }); if ( write ) { + // set service start 'true' (start status is adjusted in FcoeClient::Write) + FcoeClient::SetStartService( "fcoe", true ); + FcoeClient::SetStartService( "lldpad", true ); + ret = FcoeClient::Write(); } else // don't continue in case of error -- 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] r64644 - /trunk/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: gs Date: Thu Jun 30 11:53:22 2011 New Revision: 64644 URL: http://svn.opensuse.org/viewcvs/yast?rev=64644&view=rev Log: typos corrected (bug #703101) Modified: trunk/fcoe-client/src/helps.ycp Modified: trunk/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/helps.ycp?rev=64… ============================================================================== --- trunk/fcoe-client/src/helps.ycp (original) +++ trunk/fcoe-client/src/helps.ycp Thu Jun 30 11:53:22 2011 @@ -94,8 +94,8 @@ /* Interfaces dialog help 3/4 */ _("The values for 'FCoE VLAN interface' in detail: not available means, FCoE isn't possible (must be enabled on the switch first) -not configered: FCoE is possible but not yet activated, press Create FCoE VLAN Interface to do this. - If the FCoE VLAN interface is already created the name shown in the column, e.g. eth3.200.") + +not configured: FCoE is possible but not yet activated, press Create FCoE VLAN Interface to do this. + If the FCoE VLAN interface is already created the name is shown in the column, e.g. eth3.200.") + /* Interfaces dialog help 3/4 */ _("To change the configuration of an existing FCoE VLAN interface press button Change Settings." ), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0