Hello community, here is the log from the commit of package yast2-bootloader checked in at Tue Oct 21 12:45:17 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-10-16 02:05:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-10-21 12:44:17.933313000 +0200 @@ -1,0 +2,24 @@ +Tue Oct 21 12:01:31 CEST 2008 - juhliarik@suse.cz + +- added fix for problem with deleting all boot section for elilo + (bnc #436899) +- added fox for problem with XEN boot section in domU (bnc #436899) +- 2.17.30 + +------------------------------------------------------------------- +Fri Oct 17 14:58:02 CEST 2008 - juhliarik@suse.cz + +- added fix for adding language to GRUB (bnc #429287) +- 2.17.29 + +------------------------------------------------------------------- +Thu Oct 16 15:24:21 CEST 2008 - juhliarik@suse.cz + +- added fix for using autoyast profil from SLES9 (bnc #344659) + +------------------------------------------------------------------- +Thu Oct 16 10:05:03 CEST 2008 - juhliarik@suse.cz + +- added fix for handling mounpoints (bnc #431977) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.17.28.tar.bz2 New: ---- yast2-bootloader-2.17.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.CV3281/_old 2008-10-21 12:44:32.000000000 +0200 +++ /var/tmp/diff_new_pack.CV3281/_new 2008-10-21 12:44:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.28) +# spec file for package yast2-bootloader (Version 2.17.30) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,20 +19,23 @@ Name: yast2-bootloader -Version: 2.17.28 +Version: 2.17.30 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.28.tar.bz2 +Source0: yast2-bootloader-2.17.30.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: #!BuildIgnore: autoyast2-installation PreReq: /bin/sed %fillup_prereq # Installation::*version variables -Requires: yast2 >= 2.17.0 +Requires: yast2 >= 2.17.36 +Requires: yast2-packager >= 2.17.24 Requires: yast2-core yast2-storage perl-Bootloader parted perl-Compress-Zlib limal-perl +BuildRequires: yast2 >= 2.17.36 +BuildRequires: yast2-packager >= 2.17.24 %ifarch %ix86 x86_64 Requires: master-boot-code %endif @@ -61,7 +64,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.17.28 +%setup -n yast2-bootloader-2.17.30 %build %{prefix}/bin/y2tool y2autoconf @@ -108,6 +111,18 @@ /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Tue Oct 21 2008 juhliarik@suse.cz +- added fix for problem with deleting all boot section for elilo + (bnc #436899) +- added fox for problem with XEN boot section in domU (bnc #436899) +- 2.17.30 +* Fri Oct 17 2008 juhliarik@suse.cz +- added fix for adding language to GRUB (bnc #429287) +- 2.17.29 +* Thu Oct 16 2008 juhliarik@suse.cz +- added fix for using autoyast profil from SLES9 (bnc #344659) +* Thu Oct 16 2008 juhliarik@suse.cz +- added fix for handling mounpoints (bnc #431977) * Wed Oct 15 2008 juhliarik@suse.cz - added fix to proposal with "/" on logical partition (bnc #259050) * Wed Oct 15 2008 jsrain@suse.cz ++++++ yast2-bootloader-2.17.28.tar.bz2 -> yast2-bootloader-2.17.30.tar.bz2 ++++++ ++++ 62041 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.17.28/config.h.in new/yast2-bootloader-2.17.30/config.h.in --- old/yast2-bootloader-2.17.28/config.h.in 2008-10-15 13:09:25.000000000 +0200 +++ new/yast2-bootloader-2.17.30/config.h.in 2008-07-21 18:25:59.000000000 +0200 @@ -45,10 +45,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef 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.17.28/configure.in new/yast2-bootloader-2.17.30/configure.in --- old/yast2-bootloader-2.17.28/configure.in 2008-10-15 13:09:09.000000000 +0200 +++ new/yast2-bootloader-2.17.30/configure.in 2008-07-21 18:25:43.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-bootloader dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.17.28, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.17.4, http://bugs.opensuse.org/, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.28" +VERSION="2.17.4" RPMNAME="yast2-bootloader" MAINTAINER="Jozef Uhliarik <juhliarik@suse.cz>" @@ -161,14 +161,8 @@ AC_PROG_CC AC_PROG_CPP -# If we have core, get its Y2CORE_CFLAGS. -# When building core itself, it has set Y2CORE_CFLAGS elsewhere already -PKG_CHECK_EXISTS([yast2-core],[ - PKG_CHECK_MODULES(Y2CORE, yast2-core) -]) - -CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} AC_SUBST(AGENT_LIBADD) 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.17.28/scripts/update_gfxmenu new/yast2-bootloader-2.17.30/scripts/update_gfxmenu --- old/yast2-bootloader-2.17.28/scripts/update_gfxmenu 2008-10-09 16:56:52.000000000 +0200 +++ new/yast2-bootloader-2.17.30/scripts/update_gfxmenu 2008-10-17 14:52:43.000000000 +0200 @@ -38,13 +38,17 @@ # set translations of bootloaer menu entries cp $MENU_ENTRIES ./translations.$LOCALE || exit 7; else - if [ "$LOCALE_SHORT" = "en" ]; then - echo -n "en - " >languages || exit 6 + if [ -f $SRC_DIR/$LOCALE_SHORT.tr ]; then + echo -n $LOCALE > languages || exit 6 else - echo -n "$LOCALE_SHORT - en - " >languages || exit 6 + + if [ "$LOCALE_SHORT" = "en" ]; then + echo -n "en_US + " >languages || exit 6 + else + echo -n "$LOCALE_SHORT + " >languages || exit 6 + fi fi # set translations of bootloaer menu entries 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.17.28/src/grub/misc.ycp new/yast2-bootloader-2.17.30/src/grub/misc.ycp --- old/yast2-bootloader-2.17.28/src/grub/misc.ycp 2008-10-15 12:21:37.000000000 +0200 +++ new/yast2-bootloader-2.17.30/src/grub/misc.ycp 2008-10-16 15:26:51.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: misc.ycp 52183 2008-10-14 13:34:02Z juhliarik $ + * $Id: misc.ycp 52296 2008-10-16 13:26:49Z juhliarik $ * */ @@ -687,6 +687,7 @@ if (is_logical && extended != nil && BootCommon::globals["generic_mbr"]:"" == "true") selected_location = `extended; BootCommon::globals["activate"] = "true"; + SetBootloaderDevice(selected_location); } return selected_location; 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.17.28/src/modules/BootCommon.ycp new/yast2-bootloader-2.17.30/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.17.28/src/modules/BootCommon.ycp 2008-10-09 16:56:53.000000000 +0200 +++ new/yast2-bootloader-2.17.30/src/modules/BootCommon.ycp 2008-10-21 12:08:53.000000000 +0200 @@ -15,7 +15,7 @@ * Joachim Plack <jplack@suse.de> * Olaf Dabrunz <od@suse.de> * - * $Id: BootCommon.ycp 51956 2008-10-08 08:38:52Z juhliarik $ + * $Id: BootCommon.ycp 52385 2008-10-21 10:08:52Z juhliarik $ * */ @@ -874,6 +874,10 @@ if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) globals = remove(globals, "gfxmenu"); + // convert XEN section to linux section id running in domU + // bnc #436899 + ConvertXENinDomU (); + ret = ret && SetDeviceMap (my_device_mapping); ret = ret && SetSections (sections); ret = ret && SetGlobal (my_globals); 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.17.28/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.30/src/modules/Bootloader.ycp --- old/yast2-bootloader-2.17.28/src/modules/Bootloader.ycp 2008-10-14 09:26:29.000000000 +0200 +++ new/yast2-bootloader-2.17.30/src/modules/Bootloader.ycp 2008-10-21 12:08:53.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: Bootloader.ycp 52151 2008-10-13 15:00:57Z juhliarik $ + * $Id: Bootloader.ycp 52385 2008-10-21 10:08:52Z juhliarik $ * */ @@ -801,7 +801,16 @@ if ((section["root"]:nil == linux_default["root"]:nil) ||(section["root"]:nil == linux_failsafe["root"]:nil) ||(section["root"]:nil == linux_xen["root"]:nil)) - { + { + if (section["original_name"]:"" == "failsafe") + num_linux_failsafe = num_linux_failsafe -1; + + if (section["original_name"]:"" == "linux") + num_linux_default = num_linux_default -1; + + if (section["original_name"]:"" == "xen") + num_linux_xen = num_linux_xen -1; + y2milestone("deleted boot section: %1", section); return false; } else { @@ -813,6 +822,7 @@ }; return true; }); + ResolveSymlinksInSections(); y2milestone("Boot sections AFTER deleting: %1", BootCommon::sections); } 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.17.28/src/routines/autoinstall.ycp new/yast2-bootloader-2.17.30/src/routines/autoinstall.ycp --- old/yast2-bootloader-2.17.28/src/routines/autoinstall.ycp 2007-11-09 17:24:40.000000000 +0100 +++ new/yast2-bootloader-2.17.30/src/routines/autoinstall.ycp 2008-10-16 15:26:51.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: autoinstall.ycp 41373 2007-10-11 12:55:01Z odabrunz $ + * $Id: autoinstall.ycp 52296 2008-10-16 13:26:49Z juhliarik $ * */ { @@ -278,7 +278,9 @@ map<string,string> device_map = listmap ( map<string,string> entry, dm, { - return $[ entry["linux"]:"" : entry["firmware"]:"" ]; + string firmware = deletechars(entry["firmware"]:"", "()"); + + return $[ entry["linux"]:"" : firmware ]; }); exp["specific", "device_map"] = device_map; } 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.17.28/src/routines/lib_iface.ycp new/yast2-bootloader-2.17.30/src/routines/lib_iface.ycp --- old/yast2-bootloader-2.17.28/src/routines/lib_iface.ycp 2008-10-14 09:26:29.000000000 +0200 +++ new/yast2-bootloader-2.17.30/src/routines/lib_iface.ycp 2008-10-16 10:08:01.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: lib_iface.ycp 52151 2008-10-13 15:00:57Z juhliarik $ + * $Id: lib_iface.ycp 52279 2008-10-16 08:07:58Z juhliarik $ * * WARNING: * To be included to BootCommon.ycp only @@ -57,22 +57,7 @@ integer tmp_sz = size (tmpdir); return is (v, string) && substring (k, 0, tmp_sz) != tmpdir; }); - if (! Stage::initial ()) - { - // get what's really mounted - list<map<string,any> > mounted_list = (list<map<string,any> >) - SCR::Read (.proc.mounts); - map<string,string> mounted = listmap (map<string,any> m, mounted_list, { - // make partition canonical ("/dev/disk/by-id/..." -> "/dev/sda5") - map p = Storage::GetPartition( tm, m["spec"]:"" ); - y2debug ("Translated device %1 to canonical device %2", m["spec"]:"", p["device"]:""); - return $[ m["file"]:"" : p["device"]:"" ]; - }); - y2milestone ("Really mounted: %1", mounted); - mountpoints = filter (string k, any v, mountpoints, { - return mounted[k]:nil == v; - }); - } + y2milestone ("Detected mountpoints: %1", mountpoints); list<list<list> > pi = maplist (string disk, map info, tm, 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.17.28/src/routines/lilolike.ycp new/yast2-bootloader-2.17.30/src/routines/lilolike.ycp --- old/yast2-bootloader-2.17.28/src/routines/lilolike.ycp 2008-10-15 13:09:01.000000000 +0200 +++ new/yast2-bootloader-2.17.30/src/routines/lilolike.ycp 2008-10-21 12:08:53.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: lilolike.ycp 52230 2008-10-15 11:08:58Z jsrain $ + * $Id: lilolike.ycp 52385 2008-10-21 10:08:52Z juhliarik $ * */ { @@ -1451,6 +1451,55 @@ return ret; } +/** + * Convert XEN boot section to normal linux section + * if intalling in domU (bnc #436899) + * + * @return boolean true if XEN section is converted to linux section + */ + +boolean ConvertXENinDomU () +{ + + boolean ret = false; + if (!Arch::is_xenU()) + { + y2milestone("Don't convert XEN section - it is not running in domU"); + return ret; + } + + // tmp sections + list<map<string,any> > tmp_sections = []; + + foreach(map<string,any> sec, BootCommon::sections, + { + if (sec["type"]:"" != "xen") + { + tmp_sections = add(tmp_sections, sec); + + } else { + // convert XEN section to linux section + y2milestone("Converting XEN section in domU: %1", sec); + sec["type"] = "image"; + sec["original_name"] = "linux"; + if (haskey(sec,"xen")) + sec = remove(sec, "xen"); + if (haskey(sec,"xen_append")) + sec = remove(sec, "xen_append"); + + y2milestone("Converted XEN section in domU: %1", sec); + + tmp_sections = add(tmp_sections, sec); + + ret = true; + } + }); + + BootCommon::sections = tmp_sections; + return ret; +} + + } // EOF 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.17.28/src/routines/misc.ycp new/yast2-bootloader-2.17.30/src/routines/misc.ycp --- old/yast2-bootloader-2.17.28/src/routines/misc.ycp 2008-10-09 16:56:53.000000000 +0200 +++ new/yast2-bootloader-2.17.30/src/routines/misc.ycp 2008-10-16 11:08:11.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: misc.ycp 51847 2008-10-06 08:14:13Z juhliarik $ + * $Id: misc.ycp 52279 2008-10-16 08:07:58Z juhliarik $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -599,7 +599,7 @@ // partitions if ((partitions[dev, "udev_id"]:nil != nil) && (partitions[dev, "udev_id", 0]:nil != "")) { - ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); + ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); return ret; } 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.17.28/VERSION new/yast2-bootloader-2.17.30/VERSION --- old/yast2-bootloader-2.17.28/VERSION 2008-10-15 12:22:18.000000000 +0200 +++ new/yast2-bootloader-2.17.30/VERSION 2008-10-21 12:03:47.000000000 +0200 @@ -1 +1 @@ -2.17.28 +2.17.30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org