Author: juhliarik
Date: Tue Sep 30 13:37:34 2008
New Revision: 51692
URL: http://svn.opensuse.org/viewcvs/yast?rev=51692&view=rev
Log:
update converting LILo to GRUB during update system
Modified:
trunk/bootloader/src/clients/inst_lilo_convert.ycp
Modified: trunk/bootloader/src/clients/inst_lilo_convert.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/inst_lilo_convert.ycp?rev=51692&r1=51691&r2=51692&view=diff
==============================================================================
--- trunk/bootloader/src/clients/inst_lilo_convert.ycp (original)
+++ trunk/bootloader/src/clients/inst_lilo_convert.ycp Tue Sep 30 13:37:34 2008
@@ -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 new_files = $[];
new_files["/etc/lilo.conf"] = lilo_conf;
y2milestone("/etc/lilo.conf : %1", new_files);
- BootCommon::ProposeDeviceMap ();
- BootCommon::SetDeviceMap(BootCommon::device_mapping);
- map 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