Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Tue Sep 30 14:06:57 CEST 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-09-29 17:29:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-09-30 13:48:28.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Sep 30 13:37:44 CEST 2008 - juhliarik@suse.cz
+
+- updated fix for converting LILO to GRUB (bnc #430579)
+- 2.17.24
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.23.tar.bz2
New:
----
yast2-bootloader-2.17.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.h17784/_old 2008-09-30 14:06:44.000000000 +0200
+++ /var/tmp/diff_new_pack.h17784/_new 2008-09-30 14:06:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.23)
+# spec file for package yast2-bootloader (Version 2.17.24)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.23
+Version: 2.17.24
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.23.tar.bz2
+Source0: yast2-bootloader-2.17.24.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:
@@ -61,7 +61,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.23
+%setup -n yast2-bootloader-2.17.24
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,6 +107,9 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Tue Sep 30 2008 juhliarik@suse.cz
+- updated fix for converting LILO to GRUB (bnc #430579)
+- 2.17.24
* Mon Sep 29 2008 juhliarik@suse.cz
- added new dialog for updating from lilo to grub (bnc #430579)
- 2.17.23
++++++ yast2-bootloader-2.17.23.tar.bz2 -> yast2-bootloader-2.17.24.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp new/yast2-bootloader-2.17.24/src/clients/inst_lilo_convert.ycp
--- old/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp 2008-09-29 17:07:57.000000000 +0200
+++ new/yast2-bootloader-2.17.24/src/clients/inst_lilo_convert.ycp 2008-09-30 12:38:03.000000000 +0200
@@ -18,7 +18,7 @@
textdomain "bootloader";
-import "Bootloader";
+
import "BootCommon";
import "Installation";
import "GetInstArgs";
@@ -27,6 +27,8 @@
import "Wizard";
import "Popup";
import "Pkg";
+import "Arch";
+import "BootGRUB";
y2milestone ("starting inst_lilo_convert");
@@ -45,25 +47,60 @@
void convertSettings()
{
-
+
string lilo_conf = (string) WFM::Read(.local.string, Installation::destdir + "/etc/lilo.conf");
+ BootCommon::InitializeLibrary(true, "lilo");
BootCommon::setLoaderType("lilo");
map