Hello community, here is the log from the commit of package yast2-bootloader checked in at Mon Sep 29 18:34:07 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-09-25 18:50:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-09-29 17:29:54.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 29 17:10:36 CEST 2008 - juhliarik@suse.cz + +- added new dialog for updating from lilo to grub (bnc #430579) +- 2.17.23 + +------------------------------------------------------------------- +Mon Sep 29 15:45:41 CEST 2008 - jsrain@suse.cz + +- fixed no scrren contents after changing loader type (bnc #427622) +- avoid mixing options of different bootloader after loaded type + change + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.17.22.tar.bz2 New: ---- yast2-bootloader-2.17.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.a28613/_old 2008-09-29 18:33:44.000000000 +0200 +++ /var/tmp/diff_new_pack.a28613/_new 2008-09-29 18:33:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.22) +# spec file for package yast2-bootloader (Version 2.17.23) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-bootloader -Version: 2.17.22 +Version: 2.17.23 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.22.tar.bz2 +Source0: yast2-bootloader-2.17.23.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.22 +%setup -n yast2-bootloader-2.17.23 %build %{prefix}/bin/y2tool y2autoconf @@ -100,13 +100,20 @@ /usr/share/YaST2/clients/bootloader*.ycp /usr/share/YaST2/clients/print-product.ycp /usr/share/YaST2/clients/inst_bootl*.ycp +/usr/share/YaST2/clients/inst_lilo_convert.ycp %{prefix}/lib/YaST2/bin/* /usr/lib/YaST2/servers_non_y2/ag_* /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc - %changelog +* Mon Sep 29 2008 juhliarik@suse.cz +- added new dialog for updating from lilo to grub (bnc #430579) +- 2.17.23 +* Mon Sep 29 2008 jsrain@suse.cz +- fixed no scrren contents after changing loader type (bnc #427622) +- avoid mixing options of different bootloader after loaded type + change * Thu Sep 25 2008 juhliarik@suse.cz - added fix for problem with changed default name (bnc #169062) - added fix for problem with editing custom boot (bnc #395009) ++++++ yast2-bootloader-2.17.22.tar.bz2 -> yast2-bootloader-2.17.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/clients/inst_lilo_convert.ycp new/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp --- old/yast2-bootloader-2.17.22/src/clients/inst_lilo_convert.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp 2008-09-29 17:07:57.000000000 +0200 @@ -0,0 +1,151 @@ +/** + * File: + * bootloader/routines/inst_bootloader.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Functions to write "dummy" config files for kernel + * + * Authors: + * Jozef Uhliarik <juhliarik@suse.cz> + * + * + */ + +{ + +textdomain "bootloader"; + +import "Bootloader"; +import "BootCommon"; +import "Installation"; +import "GetInstArgs"; +import "Mode"; +import "Label"; +import "Wizard"; +import "Popup"; +import "Pkg"; + +y2milestone ("starting inst_lilo_convert"); + + + + + +void selectPackage() +{ + if (! Pkg::IsSelected("grub")) + { + Pkg::PkgInstall ("grub"); + Pkg::PkgSolve (false); + } +} + +void convertSettings() +{ + + string lilo_conf = (string) WFM::Read(.local.string, Installation::destdir + "/etc/lilo.conf"); + 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); + BootCommon::setLoaderType("grub"); + + map<string,string> tmp_files = BootCommon::GetFilesContents (); + + 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); + y2milestone ("writing file: %1", file); + WFM::Write(.local.string, Installation::destdir + file, content); + }); +} + + + + +if ( GetInstArgs::going_back()) // going backwards? +{ + return `auto; // don't execute this once more +} + +if (Mode::update()) +{ + + // save some sysconfig variables + // register new agent pointing into the mounted filesystem + path sys_agent = .target.sysconfig.bootloader; + + string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; + SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini(`SysConfigFile(target_sysconfig_path))); + + string bl = (string) SCR::Read(add(sys_agent,.LOADER_TYPE)); + + term convert_question = `VBox( + `HBox ( + `HStretch(), + `RadioButtonGroup(`id(`convert), + `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 )) + ) + ) + ), + `HStretch() + ) + ); + any ret = nil; + if (bl == "lilo") + { + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("bootloader"); + Wizard::SetContentsButtons("Converting LILO to GRUB", convert_question, + _("LILO is not supported. The recommended option is select convert LILO to GRUB"), + Label::BackButton(), Label::NextButton()); + UI::ChangeWidget(`id(`abort),`Label, Label::CancelButton()); + UI::ChangeWidget(`id(`abort), `Enabled, false); + + while (true) + { + ret = UI::UserInput(); + string current = (string) UI::QueryWidget(`id(`convert), `CurrentButton); + // One of those dialog buttons have been pressed + if (ret == `next) + { + selectPackage(); + convertSettings(); + SCR::Write (add(sys_agent,.LOADER_TYPE), "grub"); + SCR::Write (sys_agent, nil); + } + break; + + } + UI::CloseDialog(); + } + + if (ret == `back) + return `back; + + if (ret == `next) + return `next; + +} + +y2milestone ("finish inst_lilo_convert"); + +return `auto; + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/clients/Makefile.am new/yast2-bootloader-2.17.23/src/clients/Makefile.am --- old/yast2-bootloader-2.17.22/src/clients/Makefile.am 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/clients/Makefile.am 2008-09-29 14:30:21.000000000 +0200 @@ -8,7 +8,8 @@ bootloader_proposal.ycp \ bootloader_finish.ycp \ print-product.ycp \ - inst_bootloader.ycp + inst_bootloader.ycp \ + inst_lilo_convert.ycp EXTRA_DIST = \ $(client_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/clients/Makefile.in new/yast2-bootloader-2.17.23/src/clients/Makefile.in --- old/yast2-bootloader-2.17.22/src/clients/Makefile.in 2008-07-21 18:26:00.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/clients/Makefile.in 2008-09-29 17:11:49.000000000 +0200 @@ -216,7 +216,8 @@ bootloader_proposal.ycp \ bootloader_finish.ycp \ print-product.ycp \ - inst_bootloader.ycp + inst_bootloader.ycp \ + inst_lilo_convert.ycp EXTRA_DIST = \ $(client_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/generic/dialogs.ycp new/yast2-bootloader-2.17.23/src/generic/dialogs.ycp --- old/yast2-bootloader-2.17.22/src/generic/dialogs.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/generic/dialogs.ycp 2008-09-29 16:40:24.000000000 +0200 @@ -12,7 +12,7 @@ * Joachim Plack <jplack@suse.de> * Olaf Dabrunz <od@suse.de> * - * $Id: dialogs.ycp 41373 2007-10-11 12:55:01Z odabrunz $ + * $Id: dialogs.ycp 51654 2008-09-29 13:46:03Z jsrain $ * */ @@ -50,6 +50,10 @@ global void importMetaData() { BootCommon::exports = BootCommon::GetMetaData (); + // clean option list, otherwise options of different bootloaders + // get mixed after bootloader switch + BootCommon::global_options = $[]; + BootCommon::section_options = $[]; // Extract type descriptions from exports foreach(string key, any value, BootCommon::exports, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/routines/dialogs.ycp new/yast2-bootloader-2.17.23/src/routines/dialogs.ycp --- old/yast2-bootloader-2.17.22/src/routines/dialogs.ycp 2008-08-28 16:15:40.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/routines/dialogs.ycp 2008-09-29 16:40:24.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: dialogs.ycp 49775 2008-08-06 13:42:22Z juhliarik $ + * $Id: dialogs.ycp 51646 2008-09-29 12:58:18Z jsrain $ * */ @@ -125,8 +125,7 @@ ]); if (ret != `back && ret != `abort && ret != `cancel) { - return_tab = CWMTab::CurrentTab (); - // TODO store current tab here + return_tab = CWMTab::LastTab (); } return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/routines/section_widgets.ycp new/yast2-bootloader-2.17.23/src/routines/section_widgets.ycp --- old/yast2-bootloader-2.17.22/src/routines/section_widgets.ycp 2008-09-08 17:01:09.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/routines/section_widgets.ycp 2008-09-29 17:10:20.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: section_widgets.ycp 50815 2008-09-08 15:01:09Z juhliarik $ + * $Id: section_widgets.ycp 51672 2008-09-29 15:10:19Z juhliarik $ * */ @@ -318,7 +318,9 @@ else { BootCommon::current_section["name"] = ""; - BootCommon::current_section["original_name"] = ""; + // FIXME: the problem with missing YaST commnet in menu.lst + // it seems be correct if original_name stay same... + // BootCommon::current_section["original_name"] = ""; BootCommon::current_section["__auto"] = false; BootCommon::current_section["lines_cache_id"] = ""; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/VERSION new/yast2-bootloader-2.17.23/VERSION --- old/yast2-bootloader-2.17.22/VERSION 2008-09-25 17:47:44.000000000 +0200 +++ new/yast2-bootloader-2.17.23/VERSION 2008-09-29 17:11:37.000000000 +0200 @@ -1 +1 @@ -2.17.22 +2.17.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org