Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed Apr 16 15:55:45 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-04-11 16:28:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-04-16 15:44:49.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 16 15:20:15 CEST 2008 - juhliarik@suse.cz + +- added fix for activating DM-RAID boot partition (bnc #337742) +- added fix for lilo and raid version (bnc #357897) +- 2.16.10 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.16.9.tar.bz2 New: ---- yast2-bootloader-2.16.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.mM1447/_old 2008-04-16 15:55:07.000000000 +0200 +++ /var/tmp/diff_new_pack.mM1447/_new 2008-04-16 15:55:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.16.9) +# spec file for package yast2-bootloader (Version 2.16.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-bootloader -Version: 2.16.9 +Version: 2.16.10 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.16.9.tar.bz2 +Source0: yast2-bootloader-2.16.10.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -54,7 +54,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.16.9 +%setup -n yast2-bootloader-2.16.10 %build %{prefix}/bin/y2tool y2autoconf @@ -99,6 +99,10 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Wed Apr 16 2008 juhliarik@suse.cz +- added fix for activating DM-RAID boot partition (bnc #337742) +- added fix for lilo and raid version (bnc #357897) +- 2.16.10 * Fri Apr 11 2008 juhliarik@suse.cz - added handling of option for calling kexec instead of reboot (fate#303395) ++++++ yast2-bootloader-2.16.9.tar.bz2 -> yast2-bootloader-2.16.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.9/src/grub/misc.ycp new/yast2-bootloader-2.16.10/src/grub/misc.ycp --- old/yast2-bootloader-2.16.9/src/grub/misc.ycp 2008-03-17 14:31:31.000000000 +0100 +++ new/yast2-bootloader-2.16.10/src/grub/misc.ycp 2008-04-16 15:19:39.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: misc.ycp 42703 2007-12-05 11:37:52Z jsrain $ + * $Id: misc.ycp 46737 2008-04-16 13:21:01Z juhliarik $ * */ @@ -140,28 +140,37 @@ // }); // } // } - if (num != 0) - { - if (num > 4) - { - y2milestone ("Bootloader partition type is logical"); - map tm = Storage::GetTargetMap (); - list<map> partitions = tm[mbr_dev, "partitions"]:[]; - foreach (map p, partitions, ``{ - if (p["type"]:nil == `extended) - { - num = p["nr"]:num; - y2milestone ("Using extended partition %1 instead", - num); - } - }); - } + + // (bnc # 337742) - Unable to boot the openSUSE (32 and 64 bits) after installation + // if loader_device is disk device activate BootCommon::BootPartitionDevice + if (num == 0) + { + y2milestone ("loader_device is disk device"); + p_dev = Storage::GetDiskPartition (BootCommon::BootPartitionDevice); + num = BootCommon::myToInteger( p_dev["nr"]:nil ); + } + + if (num > 4) + { + y2milestone ("Bootloader partition type is logical"); + map tm = Storage::GetTargetMap (); + list<map> partitions = tm[mbr_dev, "partitions"]:[]; + foreach (map p, partitions, ``{ + if (p["type"]:nil == `extended) + { + num = p["nr"]:num; + y2milestone ("Using extended partition %1 instead",num); + } + }); } + map<string,any> ret = $[ "num" : num, "mbr" : mbr_dev, "dev" : Storage::GetDeviceName (mbr_dev, num), ]; + + y2milestone("Partition for activating: %1", ret); return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.9/src/routines/misc.ycp new/yast2-bootloader-2.16.10/src/routines/misc.ycp --- old/yast2-bootloader-2.16.9/src/routines/misc.ycp 2008-01-24 13:19:51.000000000 +0100 +++ new/yast2-bootloader-2.16.10/src/routines/misc.ycp 2008-04-16 15:19:39.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: misc.ycp 41687 2007-10-31 13:32:10Z dfiser $ + * $Id: misc.ycp 46737 2008-04-16 13:21:01Z juhliarik $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -1486,6 +1486,17 @@ y2milestone ("Cannot install bootloader on RAID (not mirror)"); return false; } + + // (bnc 357897) - lilo reports inconsistent raid version when trying to install on raid1 + if (getLoaderType (false) == "lilo") + { + string raid_ver = info["sb_ver"]:""; //"00.90.03" + if (substring(raid_ver,0,2) == "01") + { + y2milestone ("Cannot install bootloader on RAID (lilo doesn't support raid version %1)", info["sb_ver"]:""); + return false; + } + } } // EVMS // FIXME: type detection by name deprecated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.9/VERSION new/yast2-bootloader-2.16.10/VERSION --- old/yast2-bootloader-2.16.9/VERSION 2008-04-11 15:55:43.000000000 +0200 +++ new/yast2-bootloader-2.16.10/VERSION 2008-04-16 15:22:08.000000000 +0200 @@ -1 +1 @@ -2.16.9 +2.16.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de