Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Wed Jan 10 18:41:11 CET 2007.
--------
--- yast2-bootloader/yast2-bootloader.changes 2007-01-05 19:03:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-01-10 18:07:18.227559000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 10 18:06:26 CET 2007 - jplack@suse.de
+
+- mostly complete fix for #228833, wrong elilo configurator
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Wz3357/_old 2007-01-10 18:40:20.000000000 +0100
+++ /var/tmp/diff_new_pack.Wz3357/_new 2007-01-10 18:40:20.000000000 +0100
@@ -12,7 +12,7 @@
Name: yast2-bootloader
Version: 2.15.3
-Release: 1
+Release: 3
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -112,6 +112,8 @@
/usr/share/YaST2/clients/bootfloppy.ycp
%changelog -n yast2-bootloader
+* Wed Jan 10 2007 - jplack@suse.de
+- mostly complete fix for #228833, wrong elilo configurator
* Fri Jan 05 2007 - jplack@suse.de
- fixed message handling, proposal, dialog handling for zipl, etc.
(#228841, Fate#300732)
++++++ yast2-bootloader-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.3/src/elilo/helps.ycp new/yast2-bootloader-2.15.3/src/elilo/helps.ycp
--- old/yast2-bootloader-2.15.3/src/elilo/helps.ycp 2006-12-08 12:25:33.000000000 +0100
+++ new/yast2-bootloader-2.15.3/src/elilo/helps.ycp 2007-01-10 17:54:18.000000000 +0100
@@ -46,24 +46,34 @@
];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
global map elilo_descriptions = $[
"boot" : _("Boot Image Location"),
+ "default" : _("Default Boot Section"),
+ "timeout" : _("Timeout in Seconds"),
+ "delay" : _("Delay to wait before auto booting in seconds"),
+ "prompt" : _("Show boot menu"),
+ "verbose" : _("Set level of verbosity [0-5]"),
+ "root" : _("Set global root filesystem"),
+ "readonly" : _("Force rootfs to be mounted read-only"),
+ "append" : _("Append string of options to kernel command line"),
+ "initrd" : _("Name of initrd file"),
+ "image" : _("Name of image file"),
+ "chooser" : _("Specify kernel chooser to use"),
+ "message" : _("Message printed on main screen (if supported)"),
+ "fX" : _("Display the content of a file by function keys"),
+ "noedd30" : _("Don't force EDD30 mode if not set"),
+ "fpswa" : _("Specify the filename for a specific FPSWA to load"),
+ "relocatable" : _("Allow attempt to relocate"),
+ "boot_custom" : _("Custom Boot Partition"),
+ "type_image" : _("Image Section"),
+ "image_append" : _("Optional kernel command line parameter"),
+ "image_description" : _("One line text description of the image"),
+ "image_image" : _("Kernel image"),
+ "image_initrd" : _("Initial RAM disk"),
+ "image_noverifyroot" : _("Do not verify filesystem before booting"),
+ "image_readonly" : _("Force root filesystem to be mounted read-only"),
+ "image_relocatable" : _("Allow attempt to relocate"),
+ "image_root" : _("Root device"),
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.3/src/generic/section_edit_widgets.ycp new/yast2-bootloader-2.15.3/src/generic/section_edit_widgets.ycp
--- old/yast2-bootloader-2.15.3/src/generic/section_edit_widgets.ycp 2007-01-05 19:04:29.000000000 +0100
+++ new/yast2-bootloader-2.15.3/src/generic/section_edit_widgets.ycp 2007-01-10 15:24:44.000000000 +0100
@@ -12,7 +12,7 @@
* Authors:
* Joachim Plack
*
- * $Id: section_edit_widgets.ycp 35128 2007-01-05 18:04:27Z jplack $
+ * $Id: section_edit_widgets.ycp 35202 2007-01-10 14:24:41Z jplack $
*
*/
@@ -50,7 +50,7 @@
string key, any value,
filter( string key, any value, BootCommon::section_options,
``( substring(key, 0, size(type)+1) == type + "_")
- ),
+ ),
``( $[ key : value ] )
);
@@ -64,11 +64,18 @@
*/
void SE_Init (string widget) {
string type = BootCommon::current_section["type"]:"";
- generic_Init(widget, SE_Options(type), BootCommon::current_section);
+ mapdata = mapmap(string key, any value,
+ BootCommon::current_section,
+ ``( $[ type + "_" + key : value ] )
+ );
+ generic_Init(widget, SE_Options(type), data);
}
void _section_store_data( string key, string value ) {
+ string type = BootCommon::current_section["type"]:"";
+ key = substring(key, size(type)+1);
+
if (value != nil && value != "")
BootCommon::current_section[key] = value;
else {
@@ -91,30 +98,18 @@
/**
- * Handle function of a widget
- * @param key any widget key
- * @param event map event description of event that occured
- * @return symbol always nil
- */
-symbol SE_Handle (string key, map event) {
- return generic_Handle (key, event);
-}
-
-
-/**
* Build a map describing a widget
* @return a map describing a widget
*/
map genericSectionEditWidget(string type) {
- map options = SE_Options(type);
- map gt_map = generic_Term(options, "normal");
+ map gt_map = generic_Term(SE_Options(type), "normal");
return $[
"widget" : `custom,
"custom_widget" : (term) gt_map["term"]:nil,
"init" : SE_Init,
"store" : SE_Store,
- "handle" : SE_Handle,
+ "handle" : generic_Handle,
"help" : generic_Help("section-settings") + (string) gt_map["help"]:"",
];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.3/src/modules/BootELILO.ycp new/yast2-bootloader-2.15.3/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.15.3/src/modules/BootELILO.ycp 2006-12-18 17:36:17.000000000 +0100
+++ new/yast2-bootloader-2.15.3/src/modules/BootELILO.ycp 2007-01-10 18:10:46.000000000 +0100
@@ -15,7 +15,7 @@
* Jiri Srain
* Andreas Schwab
*
- * $Id: BootELILO.ycp 34972 2006-12-18 16:36:15Z jplack $
+ * $Id: BootELILO.ycp 35213 2007-01-10 17:10:43Z jplack $
*
*/
@@ -133,14 +133,29 @@
return ret;
}
+// wrapper function to adjust to new grub name sceme
+map CreateLinuxSection (string title) {
+ map section =
+ BootCommon::CreateLinuxSection (title);
+
+ // replace "kernel" by "image"
+ if (haskey(section, "kernel")) {
+ section["image"] = section["kernel"]:"";
+ section = remove(section, "kernel");
+ }
+
+ return section;
+}
+
+
/**
* Propose sections to bootloader menu
* modifies internal sreuctures
*/
global void CreateSections () {
- map linux = BootCommon::CreateLinuxSection ("linux");
- map failsafe = BootCommon::CreateLinuxSection ("failsafe");
+ map linux = CreateLinuxSection ("linux");
+ map failsafe = CreateLinuxSection ("failsafe");
// append for default section is in global
// FIXME do it later
@@ -387,7 +402,7 @@
BootCommon::globals["timeout"] = "8";
BootCommon::globals["append"] = BootArch::DefaultKernelParams ("");
- BootCommon::UpdateSections (true, BootCommon::CreateLinuxSection);
+ BootCommon::UpdateSections (true, CreateLinuxSection);
// FIXME EFI entry name
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org