Hello community, here is the log from the commit of package yast2-bootloader checked in at Fri Apr 28 21:16:02 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-04-24 16:11:37.000000000 +0200 +++ STABLE/yast2-bootloader/yast2-bootloader.changes 2006-04-28 14:33:27.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Apr 28 14:32:22 CEST 2006 - od@suse.de + +- fixed elilo section name fix from #170129: + - getLoaderType() cannot be called from GfxMenu.ycp, so changed + internal Interface of GfxMenu::translateSectionTitle() to + accept "loader" parameter instead of "allow_blanks" parameter + - updated other functions to use/pass through the "loader" + parameter now: + GfxMenu::UpdateGfxMenuContents() + GfxMenu::getTranslationsToDiacritics() + BootCommon::translateSectionTitle() + BootCommon::UpdateGfxMenuContents() +- changed some y2milestone() messages: do not mention "lilo" when + it can be any bootloader type other than "grub" +- added me as co-author to BootCommon.ycp +- 2.13.54 + +------------------------------------------------------------------- +Thu Apr 27 16:05:59 CEST 2006 - od@suse.de + +- examine_mbr.pl needs perl-Compress-Zlib +- 2.13.53 + +------------------------------------------------------------------- +Thu Apr 27 15:56:18 CEST 2006 - od@suse.de + +- on ia64, do not use the short product name in the "second + level" bootloader elilo -- use "linux" again instead (also + sidesteps bug #170129) +- added a comment for a future feature that may introduce two "menu + levels" for grub as well +- 2.13.52 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.51.tar.bz2 New: ---- yast2-bootloader-2.13.54.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.HuWoDK/_old 2006-04-28 21:15:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HuWoDK/_new 2006-04-28 21:15:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.51) +# spec file for package yast2-bootloader (Version 2.13.54) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,16 +11,16 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.51 -Release: 1 +Version: 2.13.54 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.51.tar.bz2 +Source0: yast2-bootloader-2.13.54.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 -Requires: yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader parted +Requires: yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader parted perl-Compress-Zlib %ifarch %ix86 x86_64 Requires: master-boot-code %endif @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.51 +%setup -n yast2-bootloader-2.13.54 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,31 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Fri Apr 28 2006 - od@suse.de +- fixed elilo section name fix from #170129: +- getLoaderType() cannot be called from GfxMenu.ycp, so changed + internal Interface of GfxMenu::translateSectionTitle() to + accept "loader" parameter instead of "allow_blanks" parameter +- updated other functions to use/pass through the "loader" + parameter now: + GfxMenu::UpdateGfxMenuContents() + GfxMenu::getTranslationsToDiacritics() + BootCommon::translateSectionTitle() + BootCommon::UpdateGfxMenuContents() +- changed some y2milestone() messages: do not mention "lilo" when + it can be any bootloader type other than "grub" +- added me as co-author to BootCommon.ycp +- 2.13.54 +* Thu Apr 27 2006 - od@suse.de +- examine_mbr.pl needs perl-Compress-Zlib +- 2.13.53 +* Thu Apr 27 2006 - od@suse.de +- on ia64, do not use the short product name in the "second + level" bootloader elilo -- use "linux" again instead (also + sidesteps bug #170129) +- added a comment for a future feature that may introduce two "menu + levels" for grub as well +- 2.13.52 * Mon Apr 24 2006 - sf@suse.de - fixed regexp (Bug #168594) * Fri Apr 21 2006 - od@suse.de ++++++ yast2-bootloader-2.13.51.tar.bz2 -> yast2-bootloader-2.13.54.tar.bz2 ++++++ ++++ 2557 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.13.51/Makefile.am new/yast2-bootloader-2.13.54/Makefile.am --- old/yast2-bootloader-2.13.51/Makefile.am 2006-03-24 13:49:24.000000000 +0100 +++ new/yast2-bootloader-2.13.54/Makefile.am 2006-02-01 16:06:40.000000000 +0100 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +199,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.13.51/VERSION new/yast2-bootloader-2.13.54/VERSION --- old/yast2-bootloader-2.13.51/VERSION 2006-04-24 16:11:48.000000000 +0200 +++ new/yast2-bootloader-2.13.54/VERSION 2006-04-28 14:32:04.000000000 +0200 @@ -1 +1 @@ -2.13.51 +2.13.54 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.13.51/configure.in new/yast2-bootloader-2.13.54/configure.in --- old/yast2-bootloader-2.13.51/configure.in 2006-03-24 13:49:24.000000000 +0100 +++ new/yast2-bootloader-2.13.54/configure.in 2006-02-01 16:06:39.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.13.32, http://www.suse.de/feedback, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.13.12, http://www.suse.de/feedback, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.32" +VERSION="2.13.12" RPMNAME="yast2-bootloader" MAINTAINER="Olaf Dabrunz <od@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.13.51/src/modules/BootCommon.ycp new/yast2-bootloader-2.13.54/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.13.51/src/modules/BootCommon.ycp 2006-04-24 16:09:00.000000000 +0200 +++ new/yast2-bootloader-2.13.54/src/modules/BootCommon.ycp 2006-04-28 14:31:55.000000000 +0200 @@ -13,8 +13,9 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * Joachim Plack <jplack@suse.de> + * Olaf Dabrunz <od@suse.de> * - * $Id: BootCommon.ycp 30358 2006-04-21 17:22:43Z odabrunz $ + * $Id: BootCommon.ycp 30584 2006-04-28 12:31:51Z odabrunz $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.13.51/src/modules/GfxMenu.ycp new/yast2-bootloader-2.13.54/src/modules/GfxMenu.ycp --- old/yast2-bootloader-2.13.51/src/modules/GfxMenu.ycp 2006-04-24 16:08:42.000000000 +0200 +++ new/yast2-bootloader-2.13.54/src/modules/GfxMenu.ycp 2006-04-28 14:31:55.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: GfxMenu.ycp 30411 2006-04-24 14:08:40Z sf $ + * $Id: GfxMenu.ycp 30584 2006-04-28 12:31:51Z odabrunz $ * */ @@ -57,10 +57,10 @@ /** * Create translated name of a section * @param orig string original section name - * @param allow_blanks boolean true if blanks are allowed in section name + * @param loader string bootloader type * @return translated section name */ - global define string translateSectionTitle (string orig, boolean allow_blanks) + global define string translateSectionTitle (string orig, string loader) ``{ // // FIXME: handling of bootloader-specific restrictions should be done @@ -118,10 +118,23 @@ y2warning ("Incorrect translation %1 -> %2", orig, translated); return not_trans[orig]:orig; } - // FIXME: find a better name: "! allow_blanks" really means that the bootloader is lilo - if (! allow_blanks) + if (loader != "grub") { - if (orig == "linux") + // FIXME / FEATURE: At least for IA64, there is a two level boot + // hierarchy (efibootmgr, elilo): the first level boot menu can be + // used to select a partition (i.e. an installation), the second + // level can be used to select a kernel/commandline set. + // This may become an alternative setup for grub in the future + // (requiring a separate menu.lst on an extra partition for the + // first level, along with the changes in several parts of the + // BootGRUB code for this). + // AI: rw/od should discuss this with the grub maintainer and + // create a feature for this. + // + // ATM, this is only available for IA64. + // Thus, for "elilo", the second level string should remain + // "linux", the product name already appears in the efi menu. + if (loader != "elilo" && orig == "linux") { import "Product"; string product = Product::short_name; @@ -131,7 +144,7 @@ filtered = prod_filtered; } } - y2milestone ("adapting section title for lilo: %1", filtered); + y2milestone ("adapting section title: %1", filtered); // label tag for lilo.conf has a restricted valid character set and // limited allowed string length string cutoff = ""; @@ -152,17 +165,17 @@ break; filtered = cutoff; } - y2milestone ("section title for lilo without excess words: %1", filtered); + y2milestone ("section title without excess words: %1", filtered); // 3. last resort: cutoff excess characters filtered = substring (filtered, 0, 11); - y2milestone ("section title for lilo limited to 11 chars: %1", filtered); + y2milestone ("section title limited to 11 chars: %1", filtered); // 4. convert not allowed chars to "_" // (NOTE: this converts according to lilo requirements, ATM we do // not allow ".-" above already; so ATM this converts only " ") filtered = ReplaceRegexMatch (filtered, "[^a-zA-Z0-9.-]", "_"); - y2milestone ("section title for lilo: filtered unallowed characters: %1", filtered); + y2milestone ("section title: filtered unallowed characters: %1", filtered); } else if (contains (["linux", "failsafe", "previous", "xen"], orig) && ! Mode::test ()) @@ -187,10 +200,10 @@ /** * Get translated section names, including diacritics - * @param allow_blanks boolean true if blanks are allowed in section name + * @param loader string bootloader type * @return a map section names translations */ - global define map<string,string> getTranslationsToDiacritics (boolean allow_blanks) ``{ + global define map<string,string> getTranslationsToDiacritics (string loader) ``{ map<string,string> trans = $[ // entry of bootloader menu - only ISO 8859-1, -2 and -15 characters // are allowed. Always remove the leading '_', its just to @@ -248,7 +261,7 @@ return $[ k : v ]; }); map<string,string> ret = mapmap (string k, string v, trans, { - string il1 = translateSectionTitle (k, allow_blanks); + string il1 = translateSectionTitle (k, loader); if (contains (["linux", "failsafe", "previous", "xen"], k) && ! Mode::test ()) { import "Product"; @@ -273,10 +286,10 @@ /** * Update graphical bootloader to contain help text of current language * And make the selected installation language default - * @param allow_blanks boolean true if blanks are allowed in section name + * @param loader string bootloader type * @return boolean true on success */ -global define boolean UpdateGfxMenuContents (boolean allow_blanks) { +global define boolean UpdateGfxMenuContents (string loader) { y2milestone ("Updating GFX boot menu"); if (SCR::Read (.target.size, "/boot/message") == -1) return true; @@ -338,7 +351,7 @@ }); // update the boot message string trans_file = sformat ("%1/boot_translations", tmpdir); - map<string,string> trans_map = getTranslationsToDiacritics (allow_blanks); + map<string,string> trans_map = getTranslationsToDiacritics (loader); list<string> trans_list = maplist (string k, string v, trans_map, { return sformat ("%1\n%2", k, v); }); @@ -364,7 +377,7 @@ */ global boolean Update() { string loader = (string)SCR::Read (.sysconfig.bootloader.LOADER_TYPE); - if (! UpdateGfxMenuContents (loader == "grub")) + if (! UpdateGfxMenuContents (loader)) return false; if (loader == "lilo") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.13.51/src/routines/misc.ycp new/yast2-bootloader-2.13.54/src/routines/misc.ycp --- old/yast2-bootloader-2.13.51/src/routines/misc.ycp 2006-04-24 16:09:01.000000000 +0200 +++ new/yast2-bootloader-2.13.54/src/routines/misc.ycp 2006-04-28 14:31:55.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: misc.ycp 30358 2006-04-21 17:22:43Z odabrunz $ + * $Id: misc.ycp 30584 2006-04-28 12:31:51Z odabrunz $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -1469,7 +1469,7 @@ */ global define string translateSectionTitle (string orig) ``{ return GfxMenu::translateSectionTitle(orig, - getLoaderType(false) == "grub"); + getLoaderType(false)); } /** @@ -1572,7 +1572,7 @@ * @return boolean true on success */ global define boolean UpdateGfxMenuContents () { - return GfxMenu::UpdateGfxMenuContents(getLoaderType(false) == "grub"); + return GfxMenu::UpdateGfxMenuContents(getLoaderType(false)); } /** ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de