Hello community,
here is the log from the commit of package perl-Bootloader
checked in at Mon Jan 8 18:33:44 CET 2007.
--------
--- perl-Bootloader/perl-Bootloader.changes 2006-12-08 14:48:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2006-12-22 17:16:12.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Dec 22 17:12:57 CET 2006 - aosthof@suse.de
+
+- partial fix for ELILO (#228833)
+
+-------------------------------------------------------------------
+Fri Dec 22 16:56:07 CET 2006 - jplack@suse.de
+
+- complete implementation for (Fate#300732)
+- fix config file syntax problems from #228841
+- version bump 0.4.8
+
+-------------------------------------------------------------------
Old:
----
perl-Bootloader-0.4.7.tar.bz2
New:
----
perl-Bootloader-0.4.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.zA2293/_old 2007-01-08 18:33:39.000000000 +0100
+++ /var/tmp/diff_new_pack.zA2293/_new 2007-01-08 18:33:39.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package perl-Bootloader (Version 0.4.7)
+# spec file for package perl-Bootloader (Version 0.4.8)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,7 +11,7 @@
# norootforbuild
Name: perl-Bootloader
-Version: 0.4.7
+Version: 0.4.8
Release: 1
Requires: perl >= %{perl_version}
Requires: perl-gettext
@@ -37,7 +37,6 @@
Jiri Srain
%prep
-#setup -n Bootloader-%{version} -q
%setup -q
%build
@@ -64,6 +63,12 @@
/usr/lib/bootloader
%changelog -n perl-Bootloader
+* Fri Dec 22 2006 - aosthof@suse.de
+- partial fix for ELILO (#228833)
+* Fri Dec 22 2006 - jplack@suse.de
+- complete implementation for (Fate#300732)
+- fix config file syntax problems from #228841
+- version bump 0.4.8
* Fri Dec 08 2006 - jplack@suse.de
- fixed comment handling for ZIPL
- basic implementation for generic bootloader widgets for ZIPL
++++++ perl-Bootloader-0.4.7.tar.bz2 -> perl-Bootloader-0.4.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.7/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.4.8/lib/Bootloader/Core/ELILO.pm
--- old/perl-Bootloader-0.4.7/lib/Bootloader/Core/ELILO.pm 2006-12-08 12:21:05.000000000 +0100
+++ new/perl-Bootloader-0.4.8/lib/Bootloader/Core/ELILO.pm 2006-12-22 17:16:12.000000000 +0100
@@ -47,8 +47,19 @@
sub GetMetaData() {
my $loader = shift;
-
- # possible global entries
+
+ # Options or entries respectively have types. Four types are defined:
+ #
+ # - boolean: set or not set
+ # - string: a string of characters which can be quoted if necessary
+ # - number: a decimal number
+ # - filename: a string interpreted as a filename
+ #
+ #
+ # The config file (/etc/elilo.conf) supports the following options:
+ #
+ # Global options
+ # --------------
#
# default=value Name the default image to boot. If not defined ELILO
# will boot the first defined image.
@@ -66,26 +77,56 @@
# initrd=filename Name of initrd file
# image=filename Define a new image
# chooser=name Specify kernel chooser to use: 'simple' or 'textmenu'.
- # message=filename a message that is printed on the main screen if supported by
- # the chooser.
+ # message=filename a message that is printed on the main screen if
+ # supported by the chooser.
# fX=filename Some choosers may take advantage of this option to
# display the content of a file when a certain function
# key X is pressed. X can vary from 1-12 to cover
# function keys F1 to F12.
- # noedd30 do not force the EDD30 EFI variable to TRUE when FALSE. In other
- # words, don't force the EDD30 mode if not set.
+ # noedd30 do not force the EDD30 EFI variable to TRUE when FALSE.
+ # In other words, don't force the EDD30 mode if not set.
#
#
- # possible section types:
+ # Possible section types
+ # ----------------------
+ #
# image
#
- # image section options:
+ #
+ # Image (section) options
+ # -----------------------
+ #
# root=filename Set root filesystem for kernel
# read-only Force root filesystem to be mounted read-only
# append=string Append a string of options to kernel command line
# initrd=filename Name of initrd file
# label=string Logical name of image (used in interactive mode)
# description=string One line text description of the image.
+ #
+ #
+ # IA-64 specific global options
+ # -----------------------------
+ #
+ # fpswa=file Specify the filename for a specific FPSWA to load
+ # If this option is used no other file will be tried.
+ # relocatable In case of memory allocation error at initial
+ # load point of kernel, allow attempt to relocate
+ # (assume kernels are relocatable).
+ #
+ # IA-64 specific image options
+ # ----------------------------
+ #
+ # relocatable In case of memory allocation error at initial
+ # load point of kernel, allow attempt to relocate
+ # (assume this kernel is relocatable).
+ #
+ #
+ # IA-32 specific options
+ # ----------------------
+ #
+ # legacy-free Indicate that the host machine does not have a
+ # legacy BIOS at all.
+ #
my %exports;
@@ -93,7 +134,7 @@
my @bootpart;
my @partinfo = @{$loader->{"partitions"} || []};
- # boot from any partition (really?)
+ # FIXME: boot from any partition (really?)
@bootpart = map {
my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_;
$device;
@@ -105,50 +146,51 @@
map {
my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_;
# FIXME: weed out non-root partitions
- } @ partinfo,
+ } @partinfo,
keys %{$loader->{"md_arrays"} || {}}
);
# FIXME: is "arch" export necessary?
$exports{"global_options"} = {
- # maps to either deafult or default_menu
- default => "string:Default Boot Section/Menu:linux",
- #default_menu => "string:Default Boot Menu:",
- #timeout => "int:Timeout in Seconds:5:0:60",
- #prompt => "bool:Show boot menu",
- #target => "path:Target directory for configuration/menu section:/boot/zipl",
+ # maps to either default or default_menu
+ default => "string:Default Boot Section/Menu:Linux",
+ #default_menu => "string:Default Boot Menu:",
+ timeout => "int:Timeout in Seconds:5:0:60",
+ delay => "int:Delay to wait before auto booting in seconds:0",
+ prompt => "bool:Show boot menu",
+ verbose => "int:Set level of verbosity [0-5]:0",
+ root => "path:Set global root filesystem:/",
+ readonly => "bool:Force rootfs to be mounted read-only",
+ append => "string:Append string of options to kernel command line:",
+ initrd => "path:Name of initrd file:/boot/initrd",
+ image => "path:Name of image file:/boot/vmlinuz",
+ chooser => "string:Specify kernel chooser to use:textmenu",
+ message => "string:Message printed on main screen (if supported):",
+ fX => "path:Display the content of a file by function keys:",
+ noedd30 => "bool: Don't force EDD30 mode if not set:",
+ fpswa => "path:IA-64-only, specify the filename for a specific FPSWA to load:",
+ relocatable => "bool:IA-64-only, allow attempt to relocate:",
+
+ # FIXME: Do we really need this, thus can there be custom boot partitions?
+ boot_custom => "selectdevice:Custom Boot Partition::" . $boot_partitions,
};
-
+
my $go = $exports{"global_options"};
$exports{"section_options"} = {
- type_image => "bool:Image Section",
- type_dump => "bool:Dump Section (obsolete)",
- type_menu => "bool:Menu Section",
- # section type image; omitting implicit "label"
- image_target => "path:Target Directory for Configuration Section:/boot/zipl",
- image_image => "path:Kernel Image:/boot/image",
- image_ramdisk => "path:Initial RAM Disk:/boot/initrd",
- image_parameters => "string:Optional Kernel Parameters",
- image_parmfile => "path:Optional Parameter File",
- # section type image; omitting implicit "label"
- dump_target => "path:Target Directory for Dump Section:/boot/zipl",
- dump_dumpto => "path:Dump Device:/dev/dasd",
- dump_dumptofs => "path:SCSI Dump Device:/dev/zfcp",
- # section type image; omitting implicit "label"
- menu_menuname => "string:Menu name:usermenu",
- menu_target => "path:Target Directory for Menu Section:/boot/zipl",
- menu_list => "string:List of Menu Entries:linux:",
- # menu_list => "list:List of Menu Entries:linux:",
- menu_default => "int:Number of Default Entry:1:1:10",
- menu_timeout => "int:Timeout in seconds:5:0:60",
- menu_prompt => "bool:Show boot menu",
- # FIXME: dump section has a target, too
+ #root => "path:Set root filesystem for kernel:/",
+ root => "selectdevice:Root device::" . $root_devices,
+ readonly => "bool:Force root filesystem to be mounted read-only:",
+ append => "string:Append a string of options to kernel command line:",
+ initrd => "path:Name of initrd file:/boot/initrd",
+ label => "string:Logical name of image:Linux",
+ description => "string:One line text description of the image:",
+ relocatable => "bool:Allow attempt to relocate:",
};
-
+
my $so = $exports{"section_options"};
-
+
$loader->{"exports"}=\%exports;
return \%exports;
}
@@ -196,8 +238,13 @@
return [ $default_conf ];
}
-# TODO document
+=item
+C<< $status = Bootloader::Core::ELILO->FixSectionName ($name, \$names_ref); >>
+
+=cut
+
+# FIXME: complete the docu
sub FixSectionName {
my $self = shift;
my $name = shift;
@@ -357,6 +404,299 @@
}
}
+
+=item
+C<< $glob_info = $Bootloader::Core->Global2Info (\@glob_lines, \@section_names); >>
+
+Gets the general information from the global section of the menu file. This information
+usually means the default section, graphical menu, timeout etc. As argument it takes
+a reference to the list of hashes representing lines of the section, returns a reference
+to a hash containing the important information.
+
+=cut
+
+# map Global2Info (list