Hello community, here is the log from the commit of package yast2-bootloader checked in at Sat Jun 3 01:01:55 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-05-31 16:12:44.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-06-02 20:23:26.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 17:42:57 CEST 2006 - jplack@suse.de + +- fixed raid 1 detection in lib_iface.ycp (#178802) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.69.tar.bz2 New: ---- yast2-bootloader-2.13.70.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.DJM6Xu/_old 2006-06-03 01:01:26.000000000 +0200 +++ /var/tmp/diff_new_pack.DJM6Xu/_new 2006-06-03 01:01:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.69) +# spec file for package yast2-bootloader (Version 2.13.70) # # 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.13.69 +Version: 2.13.70 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.69.tar.bz2 +Source0: yast2-bootloader-2.13.70.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.13.69 +%setup -n yast2-bootloader-2.13.70 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,8 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Fri Jun 02 2006 - jplack@suse.de +- fixed raid 1 detection in lib_iface.ycp (#178802) * Wed May 31 2006 - od@suse.de - check for RAID1 md arrays as all others will break on reboot (#178802) ++++++ yast2-bootloader-2.13.69.tar.bz2 -> yast2-bootloader-2.13.70.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.69/VERSION new/yast2-bootloader-2.13.70/VERSION --- old/yast2-bootloader-2.13.69/VERSION 2006-05-31 16:11:18.000000000 +0200 +++ new/yast2-bootloader-2.13.70/VERSION 2006-06-02 20:20:42.000000000 +0200 @@ -1 +1 @@ -2.13.69 +2.13.70 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.69/src/routines/lib_iface.ycp new/yast2-bootloader-2.13.70/src/routines/lib_iface.ycp --- old/yast2-bootloader-2.13.69/src/routines/lib_iface.ycp 2006-05-31 16:07:09.000000000 +0200 +++ new/yast2-bootloader-2.13.70/src/routines/lib_iface.ycp 2006-06-02 20:19:07.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: lib_iface.ycp 31211 2006-05-31 14:02:10Z jplack $ + * $Id: lib_iface.ycp 31302 2006-06-02 15:56:35Z jplack $ * * WARNING: * To be included to BootCommon.ycp only @@ -39,10 +39,15 @@ */ // FIXME: this should be done directly in perl-Bootloader through LibStorage.pm global void SetDiskInfo () { + map<string,list<string> > md_info = $[]; map<string,any> mountpoints = mapmap (string k, list v, (map<string,list>)Storage::GetMountPoints (), { - return $[ k : (any)v[0]:nil]; + // detect all raid1 md devices and mark them in md_info + string device = v[0]:""; + if (v[3]:"" == "raid1") + md_info[device]=[]; + return $[ k : device ]; }); mountpoints = filter (string k, any v, mountpoints, { string tmpdir = (string)SCR::Read (.target.tmpdir); @@ -64,7 +69,6 @@ } y2milestone ("Detected mountpoints: %1", mountpoints); - map<string,list<string> > md_info = $[]; map<string,map> tm = (map<string,map>)Storage::GetTargetMap (); list<list<list> > pi = maplist (string disk, map info, tm, { @@ -80,7 +84,7 @@ string device = p["device"]:""; // We only pass along RAID1 devices as all other causes // severe breakage in the bootloader stack - if ((raid != "") && (p["raid_type"]:"" == "raid1")) + if ((raid != "") && (haskey (md_info, raid))) { list<string> members = md_info[raid]:[]; members = add (members, device); @@ -331,3 +335,13 @@ } } //end of include + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org