Author: jsuchome Date: Fri Jun 17 10:47:16 2011 New Revision: 64440 URL: http://svn.opensuse.org/viewcvs/yast?rev=64440&view=rev Log: - check the product profiles during system analysis and copy them to installed system (fate##310730) - 2.17.84 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/copy_files_finish.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/VERSION?rev=64440&r1=64439&r2=64440&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Fri Jun 17 10:47:16 2011 @@ -1 +1 @@ -2.17.83 +2.17.84 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/installation/package/yast2-installation.changes?rev=64440&r1=64439&r2=64440&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Fri Jun 17 10:47:16 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 17 10:22:24 CEST 2011 - jsuchome@suse.cz + +- check the product profiles during system analysis and + copy them to installed system (fate##310730) +- 2.17.84 + +------------------------------------------------------------------- Wed Jun 1 17:24:25 CEST 2011 - locilka@suse.cz - always loading 'pciehp' kernel module on Dell hardware Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/clients/copy_files_finish.ycp?rev=64440&r1=64439&r2=64440&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/copy_files_finish.ycp Fri Jun 17 10:47:16 2011 @@ -22,6 +22,7 @@ import "Directory"; import "Packages"; import "ProductControl"; +import "ProductProfile"; import "FileUtils"; import "String"; import "WorkflowManager"; @@ -185,6 +186,23 @@ ); } + // copy all product profiles to the installed system (fate#310730) + if (ProductProfile::all_profiles != []) + { + string target_dir = sformat ("%1/etc/productprofiles.d", Installation::destdir); + if (!FileUtils::Exists (target_dir)) + { + SCR::Execute (.target.mkdir, target_dir); + } + foreach (string profile_path, ProductProfile::all_profiles, { + y2milestone ("Copying '%1' to %2/", profile_path, target_dir); + WFM::Execute (.local.bash, + sformat ("/bin/cp -a '%1' '%2/'", profile_path, target_dir) + ); + }); + } + + // List of files used as additional workflow definitions CopyAllWorkflowFiles(); Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp?rev=64440&r1=64439&r2=64440&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp Fri Jun 17 10:47:16 2011 @@ -21,6 +21,7 @@ import "Packages"; import "Popup"; import "Product"; +import "ProductProfile"; import "Progress"; import "Report"; import "Storage"; @@ -335,6 +336,13 @@ }); Installation::probing_done = true; +// the last step is hidden +if (ProductProfile::CheckCompliance (nil) == false) +{ + return `abort; +} + + Progress::Finish(); sleep (500); Modified: branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in?rev=64440&r1=64439&r2=64440&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in Fri Jun 17 10:47:16 2011 @@ -22,8 +22,8 @@ # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 -# PackagesUI::RunPackageSelector -Requires: yast2 >= 2.17.40 +# ProductProfile.ycp +Requires: yast2 >= 2.17.98 # Required in in the first stage, after # switching to the installed system, bugzilla #249679 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org