commit yast2-bootloader

30 Sep 2008

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<string,string> new_files = $[]; 
     new_files["/etc/lilo.conf"] = lilo_conf;
     y2milestone("/etc/lilo.conf : %1", new_files);
-    BootCommon::ProposeDeviceMap ();
-    BootCommon::SetDeviceMap(BootCommon::device_mapping);
-    map<string,string> old_files = BootCommon::GetFilesContents ();
-    new_files["/boot/grub/device.map"] = old_files["/boot/grub/device.map"]:"";
-    y2milestone("added device.map : %1", new_files);
     BootCommon::SetFilesContents (new_files);
+
+    list<map <string, any > > sec = BootCommon::GetSections();
+
+    list<map <string, any > > tmp_sec = [];
+    //FIXME: change "kernel" to "image" in sections
+    foreach(map <string, any> section, sec, {
+
+	// replace "kernel" by "image"
+        if (haskey(section, "kernel")) 
+        {
+           section["image"] = section["kernel"]:"";
+           section = remove(section, "kernel");
+        }
+
+        // replace "vga" by "vgamode"
+        if (haskey(section, "vga")) 
+        {
+           section["vgamode"] = section["vga"]:"";
+           section = remove(section, "vga");
+        }
+
+        tmp_sec= add(tmp_sec, section);
+
+    });
+    sec = tmp_sec;
+    BootCommon::sections = tmp_sec;
+    BootCommon::globals = BootCommon::GetGlobal ();
+    
+    BootCommon::InitializeLibrary(true, "grub");
     BootCommon::setLoaderType("grub");
 
+    BootCommon::ProposeDeviceMap ();
+    BootGRUB::Propose();
+
+
+    BootCommon::SetDeviceMap(BootCommon::device_mapping);
+    BootCommon::SetSections(sec);
+    BootCommon::SetGlobal(BootCommon::globals);
+
+
+
     map<string,string> tmp_files = BootCommon::GetFilesContents ();
 
+    y2milestone("new content file: %1", tmp_files);
     foreach (string file, string content, tmp_files,
     {
-
 	integer last=findlastof(file,"/");
 	string path_file = substring (file, 0, last);
 	WFM::Execute(.local.mkdir, Installation::destdir + path_file);
@@ -80,7 +117,22 @@
     return `auto;                   // don't execute this once more
 }
 
-if (Mode::update())
+
+boolean checkArch()
+{
+   boolean ret = false;
+   if (Arch::x86_64() || Arch::i386() || Arch::ia64())
+      ret = true;
+
+   if (ret)
+      y2milestone("inst_lilo_convert - supported architecture for converting LILO -> GRUB");
+   else
+      y2milestone("inst_lilo_convert - UNsupported architecture for converting LILO -> GRUB");
+   return ret;
+
+}
+
+if (Mode::update() && checkArch())
 {
  
     // save some sysconfig variables
@@ -99,8 +151,8 @@
 	     `HSquash (
 	     `VBox(`Left(`Label("LILO is not supported. The recommended option is select convert LILO to GRUB")),
 		   `Left(`Label("Do you want convert settings and install GRUB?")),
-		   `Left(`RadioButton(`id("lilo"), _("Stay LILO"))),
-		   `Left(`RadioButton(`id("grub"), _("Convert Settings and Install GRUB"), true ))
+		   `Left(`RadioButton(`id("lilo"), _("Stay &LILO"))),
+		   `Left(`RadioButton(`id("grub"), _("Convert Settings and Install &GRUB"), true ))
 	     )
 	     )
 	),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.23/VERSION new/yast2-bootloader-2.17.24/VERSION
--- old/yast2-bootloader-2.17.23/VERSION	2008-09-29 17:11:37.000000000 +0200
+++ new/yast2-bootloader-2.17.24/VERSION	2008-09-30 13:38:38.000000000 +0200
@@ -1 +1 @@
-2.17.23
+2.17.24


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)