Author: lslezak Date: Mon Aug 6 17:38:49 2007 New Revision: 40029 URL: http://svn.opensuse.org/viewcvs/yast?rev=40029&view=rev Log: - always store isolinux.cfg into the config file, even if there is no change, fixed the default boot item in isolinux.cfg for AutoYast installation (#260246) - use the correct architecture when copying packages to the target directory (#292681) - 2.13.12 Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION?rev=40029&r1=40028&r2=40029&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION Mon Aug 6 17:38:49 2007 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes?rev=40029&r1=40028&r2=40029&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes Mon Aug 6 17:38:49 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Jul 26 08:22:32 CEST 2007 - lslezak@suse.cz + +- always store isolinux.cfg into the config file, even if there + is no change, fixed the default boot item in isolinux.cfg for + AutoYast installation (#260246) +- use the correct architecture when copying packages to the target + directory (#292681) +- 2.13.12 + +------------------------------------------------------------------- Fri Apr 20 15:24:25 CEST 2007 - jsuchome@suse.cz - do not require inst-source-utils, but install it by yast2-cd-creator Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp?rev=40029&r1=40028&r2=40029&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp Mon Aug 6 17:38:49 2007 @@ -1316,11 +1316,6 @@ : sformat("%1/boot/loader/isolinux.cfg", skel_root); SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); - /* - string cpCmd = sformat("cp %1/cd-creator/isolinux.cfg %2/boot/loader", - Directory::datadir, skel_root); - SCR::Execute (.target.bash, cpCmd); - */ } cpCmd = (Config["code10"]:false) ? sformat("cp %1/cd-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) @@ -1587,12 +1582,24 @@ Progress::Title(_("Checking for package availability...")); list<string> selectedPackages = Pkg::GetPackages (`selected , true); + y2milestone("Selected %1 packages: %2", size(selectedPackages), sort(selectedPackages)); list<string> failed = []; toCopy = $[]; foreach(string package, selectedPackages, ``{ - map package_data = Pkg::PkgProperties(package); + list<map> package_data_list = Pkg::PkgPropertiesAll(package); + map package_data = nil; + + // get the selected package + foreach(map pkg_data, package_data_list, + { + if (pkg_data["status"]:`unknown == `selected) + { + package_data = pkg_data; + } + } + ); if (package_data == nil || package_data == $[]) { Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg?rev=40029&r1=40028&r2=40029&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg Mon Aug 6 17:38:49 2007 @@ -2,8 +2,7 @@ # hard disk label harddisk - kernel linux - append SLX=0x202 showopts + localboot 0x80 # autoyast label AutoYaST Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp?rev=40029&r1=40028&r2=40029&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp Mon Aug 6 17:38:49 2007 @@ -609,11 +609,8 @@ } else if(ret == `next) { string isolinux_new = (string)UI::QueryWidget(`id(`isolinux), `Value); - if (isolinux_new != isolinux) - { - CDCreator::Config["bootconfig"] = isolinux_new; - } - + CDCreator::Config["bootconfig"] = isolinux_new; + y2milestone("Isolinux config: %1", isolinux_new); break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org