![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-bootloader checked in at Fri Nov 24 16:19:57 CET 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-11-22 09:35:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/yast2-bootloader/yast2-bootloader.changes 2006-11-24 14:49:58.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 24 14:47:00 CET 2006 - aosthof@suse.de + +- Sorted DMTargetMap in lilolike.ycp to match the BIOS order + (#223473) +- Fixed typos in lilolike.ycp +- 2.14.11 + +------------------------------------------------------------------- +Wed Nov 22 17:08:09 CET 2006 - ug@suse.de + +- schema file fixes (#215263) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.14.10.tar.bz2 New: ---- yast2-bootloader-2.14.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.Eg6iB0/_old 2006-11-24 16:18:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Eg6iB0/_new 2006-11-24 16:18:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.14.10) +# spec file for package yast2-bootloader (Version 2.14.11) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.14.10 +Version: 2.14.11 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.14.10.tar.bz2 +Source0: yast2-bootloader-2.14.11.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.14.10 +%setup -n yast2-bootloader-2.14.11 %build %{prefix}/bin/y2tool y2autoconf @@ -112,6 +112,13 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Fri Nov 24 2006 - aosthof@suse.de +- Sorted DMTargetMap in lilolike.ycp to match the BIOS order + (#223473) +- Fixed typos in lilolike.ycp +- 2.14.11 +* Wed Nov 22 2006 - ug@suse.de +- schema file fixes (#215263) * Wed Nov 22 2006 - aosthof@suse.de - Fixed typo in lilolike.ycp (#223145) - 2.14.10 ++++++ yast2-bootloader-2.14.10.tar.bz2 -> yast2-bootloader-2.14.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.14.10/VERSION new/yast2-bootloader-2.14.11/VERSION --- old/yast2-bootloader-2.14.10/VERSION 2006-11-22 09:33:08.000000000 +0100 +++ new/yast2-bootloader-2.14.11/VERSION 2006-11-24 14:46:41.000000000 +0100 @@ -1 +1 @@ -2.14.10 +2.14.11 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.14.10/src/config/bootloader.rnc new/yast2-bootloader-2.14.11/src/config/bootloader.rnc --- old/yast2-bootloader-2.14.10/src/config/bootloader.rnc 2006-11-21 19:34:16.000000000 +0100 +++ new/yast2-bootloader-2.14.11/src/config/bootloader.rnc 2006-11-24 13:56:33.000000000 +0100 @@ -79,6 +79,10 @@ element vga {text}? & element chainloader {text}? & element lines_cache_id {text}? & - element sectors {text}? + element sectors {text}? & + element blockoffset {text}? & + element vgamode {text}? & + element noverifyroot { "true" | "false" }? & + element image {text}? } kernel_parameters = element kernel_parameters { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.14.10/src/routines/lilolike.ycp new/yast2-bootloader-2.14.11/src/routines/lilolike.ycp --- old/yast2-bootloader-2.14.10/src/routines/lilolike.ycp 2006-11-22 09:30:50.000000000 +0100 +++ new/yast2-bootloader-2.14.11/src/routines/lilolike.ycp 2006-11-24 14:46:34.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: lilolike.ycp 34554 2006-11-22 08:30:12Z aosthof $ + * $Id: lilolike.ycp 34584 2006-11-24 13:46:31Z aosthof $ * */ { @@ -1104,7 +1104,32 @@ return v["type"]:`CT_UNKNOWN==`CT_DISK; }); } else { - targetMap = DMTargetMap; // If dmraid were found, only use them + // If dmraid(s) are found, only use them + + // Get all available dmraids in the proper BIOS order + map out = (map) SCR::Execute (.target.bash_output, "dmraid -s -c"); + + if ( out["exit"]:0 == 0 && out["stdout"]:"" != "" ) { + list<string> DMRaid_devices_in_BIOS_order = + splitstring (out["stdout"]:"", "\n"); + + // Remove last list entry (because it is empty) + integer index_empty = size(DMRaid_devices_in_BIOS_order) - 1; + remove(DMRaid_devices_in_BIOS_order, index_empty); + + // Sort the Target Map by BIOS order + DMTargetMap = listmap (string DMRaidDevice, DMRaid_devices_in_BIOS_order, { + DMRaidDevice = "/dev/mapper/" + DMRaidDevice; + if (haskey(DMTargetMap, DMRaidDevice)) { + return $[ DMRaidDevice : DMTargetMap[DMRaidDevice]:$[] ]; + } + }); + y2milestone("sorted (according to BIOS) DMTargetMap: %1", DMTargetMap); + } else { + y2error ("Command: \"dmraid -s -c\" failed, no sorting of DMTargetMap."); + } + + targetMap = DMTargetMap; } y2milestone ("Target map: %1", targetMap); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org