Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Thu Mar 27 23:31:33 CET 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-03-20 14:25:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-03-27 09:51:47.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 27 09:32:41 CET 2008 - juhliarik@suse.cz
+
+- added deleting of duplicated sections after installation
+- 2.16.8
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.16.7.tar.bz2
New:
----
yast2-bootloader-2.16.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Fb4062/_old 2008-03-27 23:30:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Fb4062/_new 2008-03-27 23:30:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.16.7)
+# spec file for package yast2-bootloader (Version 2.16.8)
#
# 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.7
+Version: 2.16.8
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.16.7.tar.bz2
+Source0: yast2-bootloader-2.16.8.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.7
+%setup -n yast2-bootloader-2.16.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +99,9 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Thu Mar 27 2008 juhliarik@suse.cz
+- added deleting of duplicated sections after installation
+- 2.16.8
* Thu Mar 20 2008 jsrain@suse.cz
- updated the way section list is displayed in the installation
proposal (fate#120376)
++++++ yast2-bootloader-2.16.7.tar.bz2 -> yast2-bootloader-2.16.8.tar.bz2 ++++++
++++ 6096 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.16.7/configure.in new/yast2-bootloader-2.16.8/configure.in
--- old/yast2-bootloader-2.16.7/configure.in 2008-03-20 14:24:07.000000000 +0100
+++ new/yast2-bootloader-2.16.8/configure.in 2008-01-24 09:29:17.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.16.7, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.16.4, http://bugs.opensuse.org/, yast2-bootloader)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,9 +18,9 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.7"
+VERSION="2.16.4"
RPMNAME="yast2-bootloader"
-MAINTAINER="Jozef Uhliarik "
+MAINTAINER="Olaf Dabrunz "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
@@ -109,7 +109,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
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.16.7/src/modules/Bootloader.ycp new/yast2-bootloader-2.16.8/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.16.7/src/modules/Bootloader.ycp 2008-03-14 08:30:23.000000000 +0100
+++ new/yast2-bootloader-2.16.8/src/modules/Bootloader.ycp 2008-03-26 17:00:01.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 45442 2008-03-13 17:38:32Z juhliarik $
+ * $Id: Bootloader.ycp 45759 2008-03-26 16:04:38Z juhliarik $
*
*/
@@ -58,7 +58,7 @@
global define string getLoaderType ();
global define string getProposedDefaultSection ();
global define boolean UpdateGfxMenu ();
-
+ global define void DelDuplicatedSections();
/**
* Write is repeating again
@@ -606,6 +606,9 @@
// read current settings...
ret = blRead (true, false);
+ // delete duplicated sections
+ DelDuplicatedSections();
+
if (BootCommon::write_settings["save_all"]:false)
BootCommon::save_all = true;
if (BootCommon::save_all)
@@ -708,7 +711,37 @@
}
+global define void DelDuplicatedSections()
+{
+ y2milestone("Deleting duplicated boot sections");
+ map linux_default = BootCommon::CreateLinuxSection ("linux");
+ map linux_failsafe = BootCommon::CreateLinuxSection ("failsafe");
+
+ y2milestone("linux_default: %1", linux_default);
+ y2milestone("linux_failsafe: %1", linux_failsafe);
+ y2milestone("Boot sections BEFORE deleting: %1", BootCommon::sections);
+ BootCommon::sections=filter(map section, BootCommon::sections,
+ {
+ if ((section["name"]:nil == linux_default["name"]:nil)
+ ||(section["name"]:nil == linux_failsafe["name"]:nil))
+ {
+ if ((section["root"]:nil == linux_default["root"]:nil)
+ ||(section["root"]:nil == linux_failsafe["root"]:nil))
+ {
+ y2milestone("deleted boot section: %1", section);
+ return false;
+ } else {
+ return true;
+ }
+ } else {
+ return true;
+ };
+ return true;
+ });
+ y2milestone("Boot sections AFTER deleting: %1", BootCommon::sections);
+ y2milestone("End deleting duplicated boot sections");
+}
// write mode settings function
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.16.7/src/routines/lilolike.ycp new/yast2-bootloader-2.16.8/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.16.7/src/routines/lilolike.ycp 2008-03-20 10:32:50.000000000 +0100
+++ new/yast2-bootloader-2.16.8/src/routines/lilolike.ycp 2008-03-26 17:00:01.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: lilolike.ycp 42703 2007-12-05 11:37:52Z jsrain $
+ * $Id: lilolike.ycp 45759 2008-03-26 16:04:38Z juhliarik $
*
*/
{
@@ -1242,6 +1242,7 @@
});
// put device with boot partition on the top:
+ /*
tmp = (regexptokenize(BootCommon::BootPartitionDevice, "([a-z/]+)[0-9]*"))[0]:"";
if (haskey(device_mapping, tmp) && device_mapping[tmp]:"" != "hd0"){
y2debug("Putting device with boot partition (%1) on the top.", tmp);
@@ -1249,7 +1250,7 @@
tmp2 = getKey("hd0", device_mapping);
device_mapping[tmp2] = device_mapping[tmp]:"";
device_mapping[tmp] = "hd0";
- }
+ }*/
}
/*** helper functions END ***/
@@ -1384,7 +1385,7 @@
}
});
y2milestone("Found usb discs: %1", usb_disks);
-
+
// change order in device_mapping if usb disk is hd0
// (FATE #302075)
if (isHd0(usb_disks)
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.16.7/VERSION new/yast2-bootloader-2.16.8/VERSION
--- old/yast2-bootloader-2.16.7/VERSION 2008-03-20 12:54:05.000000000 +0100
+++ new/yast2-bootloader-2.16.8/VERSION 2008-03-27 09:34:01.000000000 +0100
@@ -1 +1 @@
-2.16.7
+2.16.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org