October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66261 - /branches/tmp/lslezak/packager/src/clients/sw_single.ycp
by lslezak＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: lslezak Date: Wed Oct 5 13:48:24 2011 New Revision: 66261 URL: http://svn.opensuse.org/viewcvs/yast?rev=66261&view=rev Log: backported commit #59670: - sw_single - don't restart when started from command line (using "yast2 -i" option) and PKGMGR_ACTION_AT_EXIT="restart" (bnc#547609) Modified: branches/tmp/lslezak/packager/src/clients/sw_single.ycp Modified: branches/tmp/lslezak/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/packager/src/clie… ============================================================================== --- branches/tmp/lslezak/packager/src/clients/sw_single.ycp (original) +++ branches/tmp/lslezak/packager/src/clients/sw_single.ycp Wed Oct 5 13:48:24 2011 @@ -596,12 +596,12 @@ if (PKGMGR_ACTION_AT_EXIT == "summary" || size(commit_result[1]:[]) > 0) { - if (PackagesUI::ShowInstallationSummary() == `back) + if (PackagesUI::ShowInstallationSummary() == `back && size(packagelist) == 0) { force_restart = true; } } - else if (PKGMGR_ACTION_AT_EXIT == "restart") + else if (PKGMGR_ACTION_AT_EXIT == "restart" && size(packagelist) == 0) { force_restart = 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] r66260 - in /branches/tmp/lslezak/packager/src: clients/sw_single.ycp modules/PackageInstallation.ycp modules/PackageSlideShow.ycp
by lslezak＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: lslezak Date: Wed Oct 5 13:46:05 2011 New Revision: 66260 URL: http://svn.opensuse.org/viewcvs/yast?rev=66260&view=rev Log: backported commit #54940: - installation callbacks - collect installation data for the summary dialog (bnc#431854) - sw_single.ycp - do the action specified in PKGMGR_ACTION_AT_EXIT sysconfig variable when package installation is finished Modified: branches/tmp/lslezak/packager/src/clients/sw_single.ycp branches/tmp/lslezak/packager/src/modules/PackageInstallation.ycp branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp Modified: branches/tmp/lslezak/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/packager/src/clie… ============================================================================== --- branches/tmp/lslezak/packager/src/clients/sw_single.ycp (original) +++ branches/tmp/lslezak/packager/src/clients/sw_single.ycp Wed Oct 5 13:46:05 2011 @@ -19,7 +19,6 @@ { textdomain "packager"; - import "Arch"; import "Confirm"; import "Installation"; import "Mode"; @@ -32,13 +31,14 @@ import "Wizard"; import "Popup"; import "GetInstArgs"; - import "Label"; import "PackageSystem"; import "Report"; import "FileUtils"; import "PackagesUI"; import "CommandLine"; import "Progress"; + import "Directory"; + import "String"; symbol StartSWSingle() { @@ -555,8 +555,57 @@ // prepare "you must boot" popup in inst_suseconfig Kernel::SetInformAboutKernelChange (oldvmlinuzsize != newvmlinuzsize); + string suseconfig_log = Directory::logdir + "/y2log.SuSEconfig"; + integer suseconfig_log_size = FileUtils::GetSize(suseconfig_log); + + if (suseconfig_log_size < 0) + { + suseconfig_log_size = 0; + } + result = (symbol) WFM::CallFunction ("inst_suseconfig", [GetInstArgs::Buttons(false, false)]); + + // read only the new lines at the end + string command = sformat("dd bs=1 if='%1' skip=%2", String::Quote(suseconfig_log), suseconfig_log_size); + y2milestone("Reading new susconfig log: %1", command); + + map out = (map)SCR::Execute(.target.bash_output, command); + if (out["exit"]:-1 == 0) + { + PackagesUI::SetPackageSummaryItem("postinstall_log", out["stdout"]:""); + } + else + { + y2error("Could not read susconfig log: %1", out); + } } + + if (Mode::normal()) + { + string PKGMGR_ACTION_AT_EXIT = (string)SCR::Read(.sysconfig.yast2.PKGMGR_ACTION_AT_EXIT); + + if (PKGMGR_ACTION_AT_EXIT == nil) + { + PKGMGR_ACTION_AT_EXIT = "close"; + } + + y2milestone("PKGMGR_ACTION_AT_EXIT: %1", PKGMGR_ACTION_AT_EXIT); + + // display installation summary if there has been an error + // or if it's enabled in sysconfig + if (PKGMGR_ACTION_AT_EXIT == "summary" + || size(commit_result[1]:[]) > 0) + { + if (PackagesUI::ShowInstallationSummary() == `back) + { + force_restart = true; + } + } + else if (PKGMGR_ACTION_AT_EXIT == "restart") + { + force_restart = true; + } + } } } while ( force_restart ); Modified: branches/tmp/lslezak/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/packager/src/modu… ============================================================================== --- branches/tmp/lslezak/packager/src/modules/PackageInstallation.ycp (original) +++ branches/tmp/lslezak/packager/src/modules/PackageInstallation.ycp Wed Oct 5 13:46:05 2011 @@ -17,6 +17,7 @@ import "Packages"; import "SlideShow"; import "PackageSlideShow"; + import "PackagesUI"; import "Label"; @@ -129,6 +130,8 @@ PackageSlideShow::UpdateAllCdProgress (false); SlideShow::StartTimer(); + integer start_time = time(); + list commit_result = []; // returns [ int successful, list failed, list remaining, list srcremaining ] y2milestone ("Calling Pkg::Commit (%1)", config); @@ -142,6 +145,9 @@ return []; } + integer installation_time = time() - start_time; + y2milestone("Installation took %1 seconds", installation_time); + // see if installation of some packages failed list<string> errpacks = (list<string>) (commit_result[1]:[]); if (size (errpacks) > 0) @@ -160,6 +166,25 @@ merge (old_failed_packs, errpacks)); } + if (Mode::normal()) + { + // collect and set installation summary data + map<string,any> summary = PackageSlideShow::GetPackageSummary(); + + summary["time_seconds"] = installation_time; + summary["success"] = size(errpacks) == 0; + summary["remaining"] = commit_result[2]:[]; + summary["install_log"] = SlideShow::inst_log; + + if (size(errpacks) > 0) + { + summary["error"] = Pkg::LastError(); + summary["failed"] = errpacks; + } + + PackagesUI::SetPackageSummary(summary); + } + return commit_result; }; Modified: branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/packager/src/modu… ============================================================================== --- branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp Wed Oct 5 13:46:05 2011 @@ -50,6 +50,57 @@ string provide_name = ""; // currently downlaoded package name string provide_size = ""; // currently downlaoded package size + // package summary + // package counters + integer installed_packages = 0; + integer updated_packages = 0; + integer removed_packages = 0; + + integer total_downloaded = 0; + integer total_installed = 0; + + // package list (only used in installed system) + list<string> installed_packages_list = []; + list<string> updated_packages_list = []; + list<string> removed_packages_list = []; +// integer avg_download_rate = 0; + + integer current_provide_size = 0; + integer current_install_size = 0; + string current_pkg_name = ""; + boolean updating = false; + + void ResetPackageSummary() + { + installed_packages = 0; + updated_packages = 0; + removed_packages = 0; + total_downloaded = 0; + total_installed = 0; +// avg_download_rate = 0; + + // temporary values + current_provide_size = 0; + current_install_size = 0; + current_pkg_name = ""; + updating = false; + } + + global map<string,any> GetPackageSummary() + { + return $[ + "installed" : installed_packages, + "updated" : updated_packages, + "removed" : removed_packages, + "installed_list" : installed_packages_list, + "updated_list" : updated_packages_list, + "removed_list" : removed_packages_list, + "downloaded_bytes" : total_downloaded, + "installed_bytes" : total_installed, + ]; + } + + /*****************************************************************************/ /*************** Formatting functions and helpers ***************************/ /*****************************************************************************/ @@ -176,41 +227,6 @@ return total_size_to_install - TotalRemainingSize(); } - - /** - * Format an integer number as (at least) two digits; use leading zeroes if - * necessary. - * @return number as two-digit string - **/ - string FormatTwoDigits( integer x ) - { - return x < 10 && x >= 0 ? - sformat( "0%1", x ) : - sformat( "%1", x ); - } - - - /** - * Format an integer seconds value with min:sec or hours:min:sec - **/ - string FormatTime( integer seconds ) - { - if ( seconds < 0 ) - return ""; - - if ( seconds < 3600 ) // Less than one hour - { - return sformat( "%1:%2", FormatTwoDigits( seconds / 60 ), FormatTwoDigits( seconds % 60 ) ); - } - else // More than one hour - we don't hope this will ever happen, but who knows? - { - integer hours = seconds / 3600; - seconds = seconds % 3600; - return sformat( "%1:%2:%3", hours, FormatTwoDigits( seconds / 60 ), FormatTwoDigits( seconds % 60 ) ); - } - } - - /** * Format an integer seconds value with min:sec or hours:min:sec * @@ -227,11 +243,11 @@ // cut off the predicted time at a reasonable maximum. // "%1" is a predefined maximum time. - text = sformat( _(">%1"), FormatTime( -seconds ) ); + text = sformat( _(">%1"), String::FormatTime( -seconds ) ); } else { - text = FormatTime( seconds ); + text = String::FormatTime( seconds ); } return text; @@ -297,7 +313,7 @@ // %2: Media name ("SuSE Linux Professional CD 2" ) // %3: Time remaining until this media will be needed text = sformat( _("Next %1: %2 -- %3"), media_type, next_media_name, - FormatTime( remaining_times_per_cd_per_src[ current_src_no-1, current_cd_no-1 ]: 1) ); + String::FormatTime( remaining_times_per_cd_per_src[ current_src_no-1, current_cd_no-1 ]: 1) ); } else { @@ -445,6 +461,7 @@ if ( init_pkg_data_complete && ! force) return; + ResetPackageSummary(); // Reinititalize some globals (in case this is a second run) total_size_installed = 0; //total_time_elapsed = 0; @@ -923,7 +940,7 @@ if ( unit_is_seconds && bytes_per_second > 0 ) { remaining = remaining / bytes_per_second; - rem_time = FormatTime( remaining ); // column #2 + rem_time = String::FormatTime( remaining ); // column #2 if ( remaining > max_time_per_cd ) // clip off at 2 hours { @@ -971,6 +988,8 @@ // update the download rate global void UpdateCurrentPackageRateProgress(integer pkg_percent, integer bps_avg, integer bps_current) { +// avg_download_rate = bps_avg; + if( ! SlideShow::ShowingDetails() ) return; string new_text = nil; // no update of the label @@ -1023,6 +1042,13 @@ SlideShow::UpdateTable( CdStatisticsTableItems() ); } + global void DoneProvide( integer error, string reason, string name ) + { + if (error == 0) + { + total_downloaded = total_downloaded + current_provide_size; + } + } /** * Return a CD's progress bar ID @@ -1063,8 +1089,37 @@ UpdateTotalProgress(false); + if (updating) + { + updated_packages = updated_packages + 1; + + if (Mode::normal()) + { + updated_packages_list = add(updated_packages_list, current_pkg_name); + } + } + else + { + installed_packages = installed_packages + 1; + + if (Mode::normal()) + { + installed_packages_list = add(installed_packages_list, current_pkg_name); + } + } + + total_installed = total_installed + current_install_size; + } // ! deleting + else + { + removed_packages = removed_packages + 1; + if (Mode::normal()) + { + removed_packages_list = add(removed_packages_list, current_pkg_name); + } + } } @@ -1117,12 +1172,17 @@ // Heading for the progress bar for the current package // while it is deleted. "%1" is the package name. msg = sformat( _("Deleting %1"), pkg_name ); + current_pkg_name = pkg_name; } else { + updating = Pkg::PkgInstalled(current_pkg_name); + // package installation - summary text // %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB) msg = sformat( _("Installing %1 (installed size %2)"), pkg_name, String::FormatSize( pkg_size ) ); + + current_install_size = pkg_size; } @@ -1206,6 +1266,9 @@ */ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { + current_provide_size = remote ? sz : 0; + current_pkg_name = pkg_name; + if (remote) { // message in the installatino log, %1 is package name, -- 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] r66259 - /branches/tmp/lslezak/packager/
by lslezak＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: lslezak Date: Wed Oct 5 13:43:12 2011 New Revision: 66259 URL: http://svn.opensuse.org/viewcvs/yast?rev=66259&view=rev Log: temporary copy to backport PKGMGR_ACTION_AT_EXIT feature (bnc#718636) Added: branches/tmp/lslezak/packager/ (props changed) - copied from r66258, branches/SuSE-Code-11-SP2-Branch/packager/ -- 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] r66258 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: gs Date: Wed Oct 5 13:32:28 2011 New Revision: 66258 URL: http://svn.opensuse.org/viewcvs/yast?rev=66258&view=rev Log: call WriteSysconfigFiles() Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Wed Oct 5 13:32:28 2011 @@ -85,12 +85,14 @@ y2milestone( "Adding package open-fcoe to pool" ); PackagesProposal::AddResolvables( "fcoe", `package, ["open-fcoe"] ); // write changes to config files - y2milestone( "Writing config files"); + y2milestone( "Writing FCoE config files"); FcoeClient::WriteFcoeConfig(); FcoeClient::WriteCfgFiles(); // restart fcoemon y2milestone( "Restarting FCoE" ); FcoeClient::RestartServiceFcoe(); + y2milestone( "Writing sysconfig files" ); + FcoeClient::WriteSysconfigFiles(); // enable start of services y2milestone( "Enabling service start of fcoe and lldpad" ); FcoeClient::SetStartStatus( "fcoe", 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] r66257 - /tags/branch-Code-11-SP2-2_17_52/autoinstallation/
by jsrain＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: jsrain Date: Wed Oct 5 13:26:08 2011 New Revision: 66257 URL: http://svn.opensuse.org/viewcvs/yast?rev=66257&view=rev Log: Created tag branch-Code-11-SP2-2_17_52 for autoinstallation Added: tags/branch-Code-11-SP2-2_17_52/autoinstallation/ (props changed) - copied from r66256, branches/SuSE-Code-11-SP2-Branch/autoinstallation/ -- 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] r66256 - /tags/branch-Code-11-SP2-2_17_52/
by jsrain＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: jsrain Date: Wed Oct 5 13:26:05 2011 New Revision: 66256 URL: http://svn.opensuse.org/viewcvs/yast?rev=66256&view=rev Log: Created tag branch-Code-11-SP2-2_17_52 Added: tags/branch-Code-11-SP2-2_17_52/ -- 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] r66255 - /tags/stable-2_21_4/autoinstallation/
by jsrain＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: jsrain Date: Wed Oct 5 13:14:29 2011 New Revision: 66255 URL: http://svn.opensuse.org/viewcvs/yast?rev=66255&view=rev Log: Created tag stable-2_21_4 for autoinstallation Added: tags/stable-2_21_4/autoinstallation/ - copied from r66254, trunk/autoinstallation/ -- 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] r66254 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: VERSION package/autoyast2.changes src/modules/AutoInstall.ycp
by jsrain＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: jsrain Date: Wed Oct 5 13:11:28 2011 New Revision: 66254 URL: http://svn.opensuse.org/viewcvs/yast?rev=66254&view=rev Log: prevent unwanted change of autoupgrade mode to autoinstallation (bnc#722249) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION Wed Oct 5 13:11:28 2011 @@ -1 +1 @@ -2.17.51 +2.17.52 Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Wed Oct 5 13:11:28 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 5 10:57:39 UTC 2011 - jsrain@site + +- prevent unwanted change of autoupgrade mode to autoinstallation + (bnc#722249) +- 2.17.52 + +------------------------------------------------------------------- Mon Sep 26 18:03:32 CEST 2011 - ug(a)suse.de - sleep for 3 seconds after dasd initialization (bnc#593773) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp Wed Oct 5 13:11:28 2011 @@ -125,12 +125,19 @@ { boolean ret = Continue(); if (ret && size ( Profile::current ) > 0) { - y2milestone("Enabling Auto-Installation mode"); - Mode::SetMode("autoinstallation"); + if (Mode::autoupgrade()) { + y2milestone ("AutoYaST upgrade mode already set, keeping it"); + } else { + y2milestone("Enabling Auto-Installation mode"); + Mode::SetMode("autoinstallation"); + } } else if (Mode::autoinst ()) { y2milestone("No autoyast data found, switching back to manual installation"); Mode::SetMode("installation"); - } + } else if (Mode::autoupgrade ()) { + y2milestone("No autoyast data found, switching back to manual update"); + Mode::SetMode("update"); + } } else if (Stage::initial ()) { -- 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] r66253 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/modules/AutoInstall.ycp
by jsrain＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: jsrain Date: Wed Oct 5 13:11:21 2011 New Revision: 66253 URL: http://svn.opensuse.org/viewcvs/yast?rev=66253&view=rev Log: prevent unwanted change of autoupgrade mode to autoinstallation (bnc#722249) Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoInstall.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=662… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Oct 5 13:11:21 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Oct 5 13:11:21 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 5 10:57:39 UTC 2011 - jsrain@site + +- prevent unwanted change of autoupgrade mode to autoinstallation + (bnc#722249) +- 2.21.4 + +------------------------------------------------------------------- Tue Oct 4 16:34:38 CEST 2011 - ug(a)suse.de - removed TrustGpgKey (bnc#722012) Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Wed Oct 5 13:11:21 2011 @@ -134,12 +134,19 @@ { boolean ret = Continue(); if (ret && size ( Profile::current ) > 0) { - y2milestone("Enabling Auto-Installation mode"); - Mode::SetMode("autoinstallation"); + if (Mode::autoupgrade()) { + y2milestone ("AutoYaST upgrade mode already set, keeping it"); + } else { + y2milestone("Enabling Auto-Installation mode"); + Mode::SetMode("autoinstallation"); + } } else if (Mode::autoinst ()) { y2milestone("No autoyast data found, switching back to manual installation"); Mode::SetMode("installation"); - } + } else if (Mode::autoupgrade ()) { + y2milestone("No autoyast data found, switching back to manual update"); + Mode::SetMode("update"); + } } else if (Stage::initial ()) { -- 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] r66252 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: FcoeClient.ycp complex.ycp fcoe-client_finish.ycp
by gs＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: gs Date: Wed Oct 5 12:54:31 2011 New Revision: 66252 URL: http://svn.opensuse.org/viewcvs/yast?rev=66252&view=rev Log: use network.scr to write sysconfig files, additionally write config for underlying interface Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.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 Wed Oct 5 12:54:31 2011 @@ -168,7 +168,6 @@ global boolean lldpad_started = false; // service fcoe was started global boolean fcoe_started = false; // service lldpad was started -global string ifcfg_file = ""; // Settings: Define all variables needed for configuration of fcoe-client @@ -397,7 +396,7 @@ } }); content = mergestring( lines, "\n" ); - y2milestone( "Writing content: %1", content ); + y2milestone( "Writing content: %1 to %2", content, file_name ); file_exists = SCR::Write( .target.string, file_name, content ); @@ -736,7 +735,7 @@ } // -// Write /etc/fcoe/config using SCR agent +// Write /etc/fcoe/config using fcoe_config.scr // global boolean WriteFcoeConfig() { @@ -749,13 +748,48 @@ return false; // This is very important- it flushes the cache, and stores the configuration on the disk - SCR::Write(.fcoe.config, nil); + success = SCR::Write(.fcoe.config, nil); - return true; + return success; +} + +// +// Write ifcfg-files in /etc/sysconfig/network (for FCoE VLAN interface and underlying interface) +// using network.scr from yast2/library/network +// +global boolean WriteSysconfigFiles( ) +{ + list <map> netcards = GetNetworkCards(); + boolean success = true; + + foreach ( map card, (list<map>)netcards, { + if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && // FCoE VLAN is configured + card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED && Modified() ) + { + y2milestone( "Writing /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); + // write /etc/sysconfig/network/ifcfg-<fcoe-vlan-interface>, e.g. ifcfg-eth3.200 + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "BOOTPROTO", "static" ); + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "STARTMODE", "nfsroot" ); + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "ETHERDEVICE", card["dev_name"]:"" ); + SCR::Write(.network.value + card["fcoe_vlan"]:"" + "USERCONTROL", "no" ); + y2milestone( "Writing /etc/sysconfig/network/ifcfg-%1", card["dev_name"]:"" ); + // write /etc/sysconfig/network/ifcfg-<interface> (underlying interface), e.g. ifcfg-eth3 + SCR::Write(.network.value + card["dev_name"]:"" + "BOOTPROTO", "static" ); + SCR::Write(.network.value + card["dev_name"]:"" + "STARTMODE", "nfsroot" ); + SCR::Write(.network.value + card["dev_name"]:"" + "NAME", card["device"]:"" ); + } + } ); + // This is very important- it flushes the cache, and stores the configuration on the disk + success = SCR::Write( .network, nil ); + if ( !success ) + { + y2error( "Error writing /etc/sysconfig/network/ifcfg-<fcoe-interface>" ); + } + return success; } // -// Write /etc/fcoe/cfg-ethx files +// Write /etc/fcoe/cfg-ethx files using fcoe_cfg-ethx.scr // global boolean WriteCfgFiles() { @@ -764,34 +798,29 @@ string command = ""; map output = $[]; - y2milestone( "Writing /etc/fcoe/cfg-ethx files" ); - foreach ( map card, (list<map>)netcards, { if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && // FCoE VLAN is configured card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED && Modified() ) // and data are modified { - y2milestone( "Write .fcoe.cfg-ethx.value.cfg-%1.<var>", card["cfg_file"]:"" ); + y2milestone( "Writing /etc/fcoe/cfg-%1", card["cfg_file"]:"" ); success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "FCOE_ENABLE", card[ "fcoe_enable"]:"no" ); if ( !success ) { y2error( "Writing FCOE_ENABLE=%1 failed", card[ "fcoe_enable"]:"no" ); - return false; } success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "DCB_REQUIRED", card["dcb_required"]:"no" ); if ( !success ) { y2error( "Writing DCB_REQUIRED=%1 failed", card["dcb_required"]:"no" ); - return false; } success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "AUTO_VLAN", card["auto_vlan"]:"no" ); if ( !success ) { y2error( "Writing AUTO_VLAN=%1 failed", card["auto_vlan"]:"no" ); - return false; } - if ( card["dcb_required"]:"no" == "yes" ) + if ( card["dcb_required"]:"no" == "yes" ) { - //enable DCB on the interface + // enable DCB on the interface command = sformat( "dcbtool sc %1 dcb on", card["dev_name"]:"" ); y2milestone( "Executing command: %1", command ); output = (map)SCR::Execute( .target.bash_output, command ); @@ -816,11 +845,12 @@ } } ); // This is very important- it flushes the cache, and stores the configuration on the disk - SCR::Write( .fcoe.cfg-ethx, nil ); + success = SCR::Write( .fcoe.cfg-ethx, nil ); - return true; + return success; } +// restart service fcoe global boolean RestartServiceFcoe() { boolean ret = true; @@ -985,13 +1015,19 @@ if( !success ) Report::Error (_("Cannot write settings for FCoE interfaces. For details see /var/log/YaST2/y2log") ); - // restart fcoe to enable changes if(PollAbort()) return false; Progress::NextStage(); + // restart fcoe to enable changes success = RestartServiceFcoe(); /* Error message */ - if( !success ) Report::Error (_("/etc/init.d/fcoe restart failed.")); + if( !success ) Report::Error (_("Restarting of service fcoe failed.")); + sleep(sl); + + // write ifcfg-files in /etc/sysconfig/network + success = WriteSysconfigFiles(); + /* Error message */ + if( !success ) Report::Error (_("Cannot write /etc/sysconfig/network/ifcfg-files.")); sleep(sl); // adjust service start of lldpad and fcoe Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Wed Oct 5 12:54:31 2011 @@ -284,9 +284,8 @@ string vlan_interface = ""; string fcoe_vlan_interface = ""; map status_map = $[]; - boolean create_ifcfg = true; - FcoeClient::ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", dev_name, card["vlan_interface"]:"" ); + string ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", dev_name, card["vlan_interface"]:"" ); // headline of a popup: creating and starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), @@ -318,15 +317,13 @@ // if /etc/sysconfig/network/ifcfg-<if>.<vlan> already exists // call 'ifup' for the interface (creates /proc/net/vlan/<if>.<vlan>) - if ( FileUtils::Exists( FcoeClient::ifcfg_file ) ) + if ( FileUtils::Exists( ifcfg_file ) ) { string cmd_ifup = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); y2milestone( "Executing command: %1", cmd_ifup ); output = (map)SCR::Execute( .target.bash_output, cmd_ifup ); y2milestone( "Output: %1", output ); - create_ifcfg = false; // /etc/sysconfig/network/ifcfg-file already exists - if ( output["exit"]:255 == 0 ) { // only start FCoE @@ -351,39 +348,22 @@ return nil; } - // Get new status and exchange list (table) entry - vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); - if ( vlan_interface == "" ) + // Get values and exchange list (table) entry + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", card["vlan_interface"]:"" ); + + if ( fcoe_vlan_interface != "" ) { - fcoe_vlan_interface = FcoeClient::NOT_AVAILABLE; + y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); + // write config for FCoE VLAN interface + FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); + status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface, card["dev_name"]:"" ); + + // store command to be able to revert the creation of FCoE VLAN interface in case of 'Cancel' + FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); } 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 ); - FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); - status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface, card["dev_name"]:"" ); - // store command to be able to revert the creation of FCoE VLAN interface in case of 'Cancel' - // (also if only 'fipvlan -s <interface>' is called) - FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); - - if ( create_ifcfg ) - { - string config = sformat( "BOOTPROTO=\"static\"\nSTARTMODE=\"nfsroot\" -ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\n", dev_name ); - FcoeClient::ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1", fcoe_vlan_interface ); - SCR::Write(.target.string, FcoeClient::ifcfg_file, config); - y2milestone( "Writing config: %1 to %2", config, FcoeClient::ifcfg_file ); - FcoeClient::AddRevertCommand( sformat( "rm %1", FcoeClient::ifcfg_file ) ); - } - } - else - { - fcoe_vlan_interface = FcoeClient::NOT_CONFIGURED; - } + fcoe_vlan_interface = FcoeClient::NOT_CONFIGURED; } // set new values in global map network_interfaces Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.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_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_finish.ycp Wed Oct 5 12:54:31 2011 @@ -48,27 +48,41 @@ { boolean start_services = false; string command = ""; - y2milestone( "Copying files /etc/fcoe/* to destination" ); - - // copy fcoe config files to destdir - WFM::Execute (.local.bash,"test -d /etc/fcoe/ && mkdir -p '" + String::Quote(Installation::destdir) + "/etc/fcoe' && cp -a /etc/fcoe/* '" + String::Quote(Installation::destdir) + "/etc/fcoe/'"); - - // copy sysconfig file - command = sformat ( "cp -a %1 '%2/etc/sysconfig/network'", FcoeClient::ifcfg_file, - String::Quote(Installation::destdir) ); - y2milestone( "Executing command: %1", command ); - - WFM::Execute (.local.bash, command ); - - // only enable services if any FCoE VLAN interface is enabled list <map> netcards = FcoeClient::GetNetworkCards(); + if ( netcards != $[] ) + { + y2milestone( "Copying files /etc/fcoe/* to destination" ); + // copy fcoe config files to destdir + WFM::Execute (.local.bash,"test -d /etc/fcoe/ && mkdir -p '" + String::Quote(Installation::destdir) + "/etc/fcoe' && cp -a /etc/fcoe/* '" + String::Quote(Installation::destdir) + "/etc/fcoe/'"); + } + else + { + y2milestone( "Nothing to do" ); + } + foreach ( map card, netcards, { + string command = ""; + string file_name = ""; if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) { // FCoE VLAN interface is configured -> start services start_services = true; + + // copy sysconfig files + file_name = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", + card["dev_name"]:"", card["vlan_interface"] ); + command = sformat ( "cp -a %1 '%2/etc/sysconfig/network'", file_name, + String::Quote(Installation::destdir) ); + y2milestone( "Executing command: %1", command ); + WFM::Execute (.local.bash, command ); + + file_name = sformat( "/etc/sysconfig/network/ifcfg-%1", card["dev_name"]:"" ); + command = sformat ( "cp -a %1 '%2/etc/sysconfig/network'", file_name, + String::Quote(Installation::destdir) ); + y2milestone( "Executing command: %1", command ); + WFM::Execute (.local.bash, command ); } } ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0