Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Tue Jun 2 17:41:24 CEST 2009. -------- --- perl-Bootloader/perl-Bootloader.changes 2009-05-07 09:48:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2009-06-02 16:05:39.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jun 2 16:01:26 CEST 2009 - jreidinger@suse.cz + +- suppress warning about testing extended partition (bnc #504083) +- don't warn if multipath module is not loaded and just log it + (bnc #506742) +- remove last occurences of metadata as now yast2-bootloader + doesn't use it +- 0.5.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.5.1.tar.bz2 New: ---- perl-Bootloader-0.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.z10985/_old 2009-06-02 17:40:07.000000000 +0200 +++ /var/tmp/diff_new_pack.z10985/_new 2009-06-02 17:40:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.5.1) +# spec file for package perl-Bootloader (Version 0.5.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.5.1 +Version: 0.5.2 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -100,6 +100,13 @@ /boot/boot.readme %changelog +* Tue Jun 02 2009 jreidinger@suse.cz +- suppress warning about testing extended partition (bnc #504083) +- don't warn if multipath module is not loaded and just log it + (bnc #506742) +- remove last occurences of metadata as now yast2-bootloader + doesn't use it +- 0.5.2 * Thu May 07 2009 jreidinger@suse.cz - add SplitPath to library interface - fix filling partitions ++++++ perl-Bootloader-0.5.1.tar.bz2 -> perl-Bootloader-0.5.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Core/ELILO.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Core/ELILO.pm 2009-04-14 15:38:50.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Core/ELILO.pm 2009-06-02 13:00:30.000000000 +0200 @@ -43,171 +43,6 @@ our @ISA = ('Bootloader::Core'); use Bootloader::Path; -#module interface - - -sub GetMetaData() { - my $loader = shift; - - # 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. - # timeout=number The number of 10th of seconds to wait while in - # interactive mode before auto booting default kernel. - # Default is infinity. - # delay=number The number of 10th of seconds to wait before - # auto booting when not in interactive mode. - # Default is 0. - # prompt Force interactive mode - # verbose=number Set level of verbosity [0-5]. Default 0 (no verbose) - # root=filename Set global root filesystem for Linux/ia64 - # 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 - # 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. - # 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. - # - # - # Possible section types - # ---------------------- - # - # image - # - # - # 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; - - my @bootpart; - my @partinfo = @{$loader->{"partitions"} || []}; - - # FIXME: boot from any partition (really?) - @bootpart = map { - my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_; - $device; - } @partinfo; - - my $boot_partitions = join(":", @bootpart); - - my @md_arrays = keys %{$loader->{"md_arrays"} || {}}; - my @root_part = map { - my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_; - # FIXME: weed out non-root partitions - } @partinfo; - my $root_devices = join(":",@root_part,\@md_arrays); - - my $arch = $loader->{"arch"}; - - $exports{"global_options"} = { - default => "string:Default Boot Section:Linux", - timeout => "int:Timeout in 10th of Seconds:80:0:36000", - delay => "int:Delay to wait before Auto Booting in 10th of Seconds:0", - prompt => "bool:Show Boot Menu", - verbose => "int:Set Level of Verbosity [0-5]:0", - root => "path:Set global Root Filesystem:/", - "read-only" => "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:Specify the Filename for a specific FPSWA to load:", - - # shadow entries for efi boot manager - boot_efilabel => "string:EFI Boot Manager Label::", - #boot_rm_efilabel => "bool:Remove existing EFI Boot Manager Entries by Name:", - }; - - if ($arch eq "ia64") { - $exports{"global_options"}{"relocatable"} = "bool:Allow Attempt to relocate:"; - } - - my $go = $exports{"global_options"}; - - $exports{"section_options"} = { - type_image => "bool:Image Section", - image_append => "string:Optional Kernel Command Line Parameter", - image_description => "string:One Line Text Description of the Image:", - image_image => "path:Kernel Image:/boot/vmlinux", - image_initrd => "path:Initial RAM Disk:/boot/initrd", - image_noverifyroot => "bool:Do not verify Filesystem before Booting:false", - image_readonly => "bool:Force Root Filesystem to be mounted read-only:", - image_root => "selectdevice:Root Device::" . $root_devices, - - type_xen => "bool:Xen section", - xen_xen => "select:Hypervisor:/boot/xen.gz:/boot/xen.gz", - xen_xen_append => "string:Additional Xen Hypervisor Parameters:", - xen_image => "path:Kernel image:/boot/vmlinux", - xen_root => "select:Root device::" . $root_devices, - xen_append => "string:Optional kernel command line parameter", - xen_initrd => "path:Initial RAM disk:/boot/initrd", - }; - if ($arch eq "ia64") { - $exports{"section_options"}{"image_relocatable"} = "bool:Allow Attempt to relocate:"; - } - - my $so = $exports{"section_options"}; - - $loader->{"exports"}=\%exports; - return \%exports; -} - sub GetOptions{ my $loader = shift; @@ -290,7 +125,6 @@ $loader->{"arch"} = $arch; bless ($loader); - $loader->GetMetaData(); $loader->GetOptions(); $loader->l_milestone ("ELILO::new: Created ELILO instance"); return $loader; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Core/GRUB.pm 2009-04-23 16:28:32.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Core/GRUB.pm 2009-06-02 13:00:30.000000000 +0200 @@ -78,191 +78,6 @@ our @ISA = ('Bootloader::Core'); use Bootloader::Path; -#module interface - -sub bootable($) { - my $fsid = shift; - - for my $id ( 5, 6, 11..15, 130, 131) { - return 1 if $fsid == $id; - } - return 0; -} - -sub GetMetaData() { - my $loader = shift; - - # possible global entries: - # - - # activate # encode somewhere in grub.conf - # generic_mbr # ditto - - # boot_custom # data for grub.conf - # boot_mbr - # boot_root - # boot_boot - - # map - # unhide - # hide - # rootnoverify - # serial - # terminal - # default - # timeout - # fallback - # hiddenmenu - # gfxmenu - # * password:: Set a password for the menu interface - - # * bootp:: --with-configfile Initialize a network device via BOOTP - # * color:: Color the menu interface - # * dhcp:: Initialize a network device via DHCP - # * ifconfig:: Configure a network device manually - # * rarp:: Initialize a network device via RARP - # debug - - # image section - - # root (hd0,0) # omit this, it's always encoded in image/initrd path - # image # kernel /new_kernel - # append - # initrd - # savedefault # not supported - - # xen section - - # xen - # xen_append - # image - # append - # initrd - - # chainloader section - # lock - # root - # noverifyroot # true if rootnoverify is used instead of root - # makeactive - # blockoffset # this is encoded in 'chainloader' +1 - - # FIXME: add help texts for all widgets - - my %exports; - - my @bootpart; - my @partinfo = @{$loader->{"partitions"} || []}; - my %dev_map = %{$loader->{"mountpoints"} || {}}; - - # Partitioninfo is a list of list references of the format: - # Device, disk, nr, fsid, fstype, part_type, start_cyl, size_cyl - # /dev/sda9 /dev/sda 9 258 Apple_HFS `primary 0 18237 - # - - # boot from any bootable primary partition which doesn't have xfs (small size of boot sector) - my $boot_partitions = join(":", - map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($fstype ne "xfs" and bootable($fsid)) - ? $device : (); - } @partinfo - ); - - # give a list of possible root devices: all MD devices - # and all 'Linux' devices above 20 cylinders and not swap - my $root_devices = join(":", - (map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - # allow only linux standart partitions, 130 is linux swap - (($fsid eq "131" or ($fsid ne "130" and $fstype =~ m:linux:i)) and - $size_cyl >= 20) - ? $device : (); - } @partinfo), - keys %{$loader->{"md_arrays"} || {}} - # FIXME this does no longer include raid0 and raid5 devices - ); - - # give a list of all other partitions possibly ready for chain loading - my $other_partitions = join(":", - map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($size_cyl >= 20) ? $device : (); - } @partinfo - ); - - # does it make sense to distinguish between x86_64 and x86? - #jreidinger: no, it only is here to uniform with ppc where it is reasonable - $exports{"arch"} = "x86"; - $exports{"global_options"} = { - boot => "multi:Boot Loader Locations:", - activate => "bool:Set active Flag in Partition Table for Boot Partition:true", - timeout => "int:Timeout in Seconds:8:0:3600", - default => "string:Default Boot Section:Linux", - generic_mbr => "bool:Write generic Boot Code to MBR:true", - boot_custom => "selectdevice:Custom Boot Partition::" . $boot_partitions, - boot_mbr => "bool:Boot from Master Boot Record:false", - boot_root => "bool:Boot from Root Partition:true", - boot_boot => "bool:Boot from Boot Partition:true", - boot_extended => "bool:Boot from Extended Partition:true", - - # map - # unhide - # hide - # rootnoverify - - serial => "string:Serial connection parameters:", - terminal => "string:Terminal definition:", - fallback => "string:Fallback sections if default fails:1", - hiddenmenu => "bool:Hide menu on boot:false", - gfxmenu => "path:Graphical menu file:/boot/message", - password => "password:Password for the Menu Interface:", - - # * bootp:: --with-configfile Initialize a network device via BOOTP - # * color:: Color the menu interface - # * dhcp:: Initialize a network device via DHCP - # * ifconfig:: Configure a network device manually - # * rarp:: Initialize a network device via RARP - debug => "bool:Debugging flag:false" - }; - - $exports{"section_options"} = { - type_image => "bool:Image section", - # image_name => "string:Name of section", # implicit - image_image => "path:Kernel image:/boot/vmlinux", - image_root => "selectdevice:Root device:". ($dev_map{"/"} || "").":" . $root_devices, - image_vgamode => "string:Vga Mode", - image_append => "string:Optional kernel command line parameter", - image_initrd => "path:Initial RAM disk:/boot/initrd", - image_noverifyroot=> "bool:Do not verify filesystem before booting:false", - - type_other => "bool:Chainloader section", - other_lock => "bool:Use password protection:false", - other_chainloader => "selectdevice:Other system::" . $other_partitions, - other_noverifyroot=> "bool:Do not verify filesystem before booting:false", - other_makeactive => "bool:Activate this partition when selected for boot:false", - other_blockoffset => "int:Block offset for chainloading:1:0:32", - - type_xen => "bool:Xen section", - xen_xen => "select:Hypervisor:/boot/xen.gz:/boot/xen.gz", - xen_xen_append => "string:Additional Xen Hypervisor Parameters:", - xen_image => "path:Kernel image:/boot/vmlinux", - xen_root => "select:Root device::" . $root_devices, - xen_vgamode => "string:Vga Mode", - xen_append => "string:Optional kernel command line parameter", - xen_initrd => "path:Initial RAM disk:/boot/initrd", - - type_menu => "bool:Menu section", - menu_root => "select:Partition of menu file:::" . $other_partitions, - menu_configfile => "path:Menu description file:/boot/grub/menu.lst" - }; - - $loader->{"exports"}=\%exports; - return \%exports; -} - # Internal metadata only for checking of valid values, doesn't affect any yast sub GetOptions{ my $loader = shift; @@ -336,7 +151,6 @@ my $loader = $self->SUPER::new ($old); bless ($loader); - $loader->GetMetaData(); #FIXME this is not need but need test before remove $loader->GetOptions(); $loader->l_milestone ("GRUB::new: Created GRUB instance"); return $loader; @@ -569,9 +383,14 @@ # fallback to grub device hd0 if translation has failed - this is good # enough for many cases - #FIXME try get partition number from device my $partition_fallback = 0; + if ( $original =~ m/(\d+)\s*$/ ) + { + $partition_fallback = $1 - 1; + $partition_fallback = 0 if ($partition_fallback < 0 ); + } + if ($dev !~ /^${grubdev_pattern}$/) { $dev = "hd0"; $self->l_warning ("GRUB::UnixDev2GrubDev: Unknown device '$original', fall back to ($dev)"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Core/NONE.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Core/NONE.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Core/NONE.pm 2008-11-04 18:28:50.000000000 +0100 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Core/NONE.pm 2009-06-02 13:00:30.000000000 +0200 @@ -48,19 +48,6 @@ #module interface -sub GetMetaData() { - my $loader = shift; - - my %exports; - - $exports{"global_options"} = {}; - - $exports{"section_options"} = {}; - - $loader->{"exports"}=\%exports; - return \%exports; -} - =item C<< $obj_ref = Bootloader::Core::NONE->new (); >> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Core/PowerLILO.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Core/PowerLILO.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Core/PowerLILO.pm 2009-04-14 15:38:50.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Core/PowerLILO.pm 2009-06-02 13:00:30.000000000 +0200 @@ -45,198 +45,6 @@ use Bootloader::Path; -#module interface - -sub GetMetaData() { - my $loader = shift; - - # possible global entries: - # - # boot (might be more than one) - # clone - # activate - # force_fat - # force - # progressbar (deprecated, check yaboot) - # bootfolder - # timeout - # macos_timeout - # default - # append - # initrd - # - # - # per section entries - # image - # optional - # other - # root - # copy - # label - # append - # sysmap (deprecated, yaboot)) - # initrd - - # FIXME: add help texts for all widgets - - my %exports; - - # one of iseries, prep, chrp, pmac_old, pmac_new ... - my $lilo = Bootloader::Path::Lilo_lilo(); - my $arch = qx{ $lilo --get-arch }; - chomp( $arch ); - $arch = "pmac" if "$arch" =~ /^pmac/; - - my @bootpart; - my @partinfo = @{$loader->{"partitions"} || []}; - - # Partitioninfo is a list of list references of the format: - # Device, disk, nr, fsid, fstype, part_type, start_cyl, size_cyl - # /dev/sda9 /dev/sda 9 258 Apple_HFS `primary 0 18237 - # - if ( "$arch" eq "chrp" ) { - # boot from any primary partition with PReP or FAT partition id - @bootpart = map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($part_type eq "`primary" and - ($fsid eq "6" or $fsid eq "12" or $fsid eq "65")) - ? $device : (); - } @partinfo; - } - elsif ( "$arch" eq "iseries" ) { - # boot from any primary PReP partition on a virtual disk - @bootpart = map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($part_type eq "`primary" and - $fsid eq "65" and - $device =~ m:^/dev/iseries/:) - ? $device : (); - } @partinfo; - } - elsif ( "$arch" eq "pmac" ) { - # boot from any Apple_HFS partition but dont take the big ones - @bootpart = map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - (($fstype eq "Apple_HFS" or - $fstype eq "Apple_Bootstrap") - and $size_cyl < 20) - ? $device : (); - } @partinfo; - } - elsif ( "$arch" eq "prep" ) { - # boot from any primary PReP partition - @bootpart = map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($fsid eq "65" and - $part_type eq "`primary") - ? $device : (); - } @partinfo; - } - - # unknown architecture, or no match, give no valid selection - @bootpart = ("- no valid boot partition -") unless @bootpart; - - my $boot_partitions = join(":", @bootpart); - - # give a list of possible root devices: all MD devices - # and all 'Linux' devices above 20 cylinders - my $root_devices = join(":", - (map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - (($fsid eq "131" or $fstype =~ m:linux:i) and - $size_cyl >= 20) - ? $device : (); - } @partinfo), - keys %{$loader->{"md_arrays"} || {}} - ); - - $exports{"arch"} = $arch; - $exports{"global_options"} = { - # for iseries list for others exactly one allowed - boot => ( "$arch" eq "iseries" ) - ? "multi:iSeries boot image location:" - : "select:PPC Boot loader location:", - activate => "bool:Change boot-device in NV-RAM:true", - timeout => "int:Timeout in 1/10th seconds:50:0:600", - default => "string:Default boot section:Linux", - root => "selectdevice:Default root device::" . ":" . $root_devices, - append => "string:Append options for kernel command line", - initrd => "path:Default initrd path" - }; - - my $go = $exports{"global_options"}; - - if ( "$arch" eq "chrp" ) { - # pSeries only - $go->{clone} = "selectdevice:Partition for boot loader duplication::" . ":" . $boot_partitions; - $go->{force_fat} = "bool:Always boot from FAT partition:false"; - $go->{force} = "bool:Install boot loader even on errors:false"; - - $go->{boot_chrp_custom} - = "select:PReP or FAT partition::" . $boot_partitions; - } - elsif ( "$arch" eq "prep" ) { - # only on old prep machines - $go->{bootfolder} = "string:Bootfolder path"; - $go->{boot_prep_custom} - = "selectdevice:PReP partition::" . $boot_partitions; - } - elsif ( "$arch" eq "iseries" ) { - # only on legacy iseries - $go->{boot_slot} = "select:Write to boot slot:B:" . "A:B:C:D"; - $go->{boot_file} = "path:Create boot image in file:/tmp/suse_boot_image"; - $go->{boot_iseries_custom} - = "selectdevice:PReP partition::" . $boot_partitions; - } - elsif ( "$arch" eq "pmac" ) { - # only on pmac_new and pmac_old - $go->{bootfolder} = "string:Bootfolder path:"; - $go->{boot_pmac_custom} - = "select:HFS boot partition::" . $boot_partitions; - $go->{no_os_chooser} = "bool:Do not use os-chooser:false"; - $go->{macos_timeout} = "int:Timeout in seconds for MacOS/Linux selection:5:0:60", - } - - $exports{"section_options"} = { - type_image => "bool:Kernel section", - image_image => "path:Kernel image:/boot/vmlinux", - image_root => "select:Root device::" . $root_devices, - # image_label => "string:Name of section", # implicit - image_append => "string:Optional kernel command line parameter", - image_initrd => "path:Initial RAM disk:/boot/initrd", - image_optional => "bool:Skip section gracefully on errors:true", - }; - - my $so = $exports{"section_options"}; - - if ( "$arch" eq "pmac" ) { - # only on pmac_new and pmac_old - $so->{image_copy} = "bool:Copy image to boot partition:false"; - - # define new section type for MacOS boot - $so->{type_other} = "bool:Boot other system"; - # $so{other_label} = "string:Name of section" # implicit! - $so->{other_other} = "select:Boot partition of other system::" . join - (":", - # boot from any Apple_HFS partition but _only_ take the big ones - map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($fstype eq "Apple_HFS" and $size_cyl >= 20) - ? $device : (); - } @partinfo - ); - } - - $loader->{"exports"}=\%exports; - return \%exports; -} - sub GetOptions() { my $loader = shift; @@ -358,7 +166,6 @@ bless ($loader); - $loader->GetMetaData(); $loader->GetOptions(); $loader->l_milestone ("PowerLILO::new: Created PowerLILO instance"); return $loader; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Core/ZIPL.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Core/ZIPL.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Core/ZIPL.pm 2009-04-14 15:38:50.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Core/ZIPL.pm 2009-06-02 13:00:30.000000000 +0200 @@ -65,90 +65,6 @@ use Bootloader::Core; our @ISA = qw(Bootloader::Core); -#module interface - -sub GetMetaData() { - my $loader = shift; - - # possible global entries - # - # default - # timeout - # prompt - # target - # - # possible section types: - # image - # dump - # menu - # - # per section entries - # - # label - # menuname - # image - # ramdisk - # dumpto - # target - # parameters - # dumptofs (unimplemented) - # parmfile (unimplemented) - - my %exports; - - my @bootpart; - my @partinfo = @{$loader->{"partitions"} || []}; - - # boot from any partition (really?) - @bootpart = map { - my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_; - $device; - } @partinfo; - - my $boot_partitions = join(":", @bootpart); - - my $root_devices = join(":", - (map { - my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_; - # FIXME: weed out non-root partitions - } @partinfo), - keys %{$loader->{"md_arrays"} || {}} - ); - - $exports{"global_options"} = { - # maps to either deafult or default_menu - default => "string:Default Boot Section/Menu:linux", - }; - - $exports{"section_options"} = { - type_image => "bool:Image Section", - image_target => "path:Target Directory for Image Section:/boot/zipl", - image_image => "path:Kernel Image:/boot/image", - # converted from ramdisk => initrd - image_initrd => "path:Initial RAM Disk:/boot/initrd", - # converted from parameters => append, root - image_append => "string:Optional Kernel Parameters", - image_root => "selectdevice:Root device::" . $root_devices, - image_parmfile => "path:Optional Parameter File", - - type_dump => "bool:Dump Section (obsolete)", - 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", - - type_menu => "bool:Menu Section", - 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", - }; - - $loader->{"exports"}=\%exports; - return \%exports; -} - sub SetOptions() { my $loader = shift; @@ -227,7 +143,6 @@ $loader->{"default_global_lines"} = [ ]; bless ($loader); - $loader->GetMetaData(); $loader->SetOptions(); $loader->l_milestone ("ZIPL::new: Created ZIPL instance"); return $loader; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Core.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Core.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Core.pm 2009-04-23 10:53:36.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Core.pm 2009-05-19 11:17:07.000000000 +0200 @@ -379,7 +379,7 @@ # Check for valid devices unless ($part_dev =~ m/^\/dev\/[sh]d[a-z](\d+)?$/) { - $self->l_warning ("Core::GetExtendedPartition: Specified device + $self->l_milestone ("Core::GetExtendedPartition: Specified device $part_dev is not valid and cannot be used as base for detecting an extended partition on the same disk."); return $extended_part_dev; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Library.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Library.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Library.pm 2009-05-07 15:35:57.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Library.pm 2009-06-02 13:00:30.000000000 +0200 @@ -49,8 +49,6 @@ C<< $status Bootloader::Library->SetSettings ($settings_ref); >> -C<< $meta_ref = Bootloader::Library->GetMetaData (); >> - C<< $global_ref = Bootloader::Library->GetGlobalSettings (); >> C<< $status = Bootloader::Library->SetGlobalSettings ($global_settings_ref); >> @@ -768,22 +766,6 @@ } =item -C<< $meta_ref = Bootloader::Library->GetMetaData (); >> - -Gets the meta data of the bootloader describing possible setting in the config, -its data type, default value, etc. -Returns undef on fail. - -=cut - -sub GetMetaData { - my $self = shift; - my $loader = $self->{loader} || return undef; - - return $loader->GetMetaData(); -} - -=item C<< $global_ref = Bootloader::Library->GetGlobalSettings (); >> Gets the global settings of the bootloader. See the example map above TODO diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Logger.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Logger.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Logger.pm 2009-04-22 13:57:35.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Logger.pm 2009-06-02 13:00:30.000000000 +0200 @@ -19,56 +19,6 @@ C<< $obj_ref = Bootloader::Logger->new (); >> -C<< $status = Bootloader::Library->SetLoaderType ($bootloader); >> - -C<< $status = Bootloader::Library->DefineMountPoints (\%mountpoints); >> - -C<< $status = Bootloader::Library->DefinePartitions (\@partitions); >> - -C<< $status = Bootloader::Library->DefineMDArrays (\%md_arrays); >> - -C<< $status = Bootloader::Library->ReadSettings (); >> - -C<< $status = Bootloader::Library->WriteSettings (); >> - -C<< $status = Bootloader::Library->ReadSettingsTmp ($tmp_dir); >> - -C<< $status = Bootloader::Library->WriteSettingsTmp ($tmp_dir); >> - -C<< $files_contents_ref = Bootloader::Library->GetFilesContents (); >> - -C<< $status = Bootloader::Library->SetFilesContents (\%files_contents); >> - -C<< $status = Bootloader::Library->UpdateBootloader ($avoid_init); >> - -C<< $status = Bootloader::Library->InitializeBootloader (); >> - -C<< $file_list_ref = Bootloader::Library->ListConfigurationFiles (); >> - -C<< $settings_ref = Bootloader::Library->GetSettings (); >> - -C<< $status Bootloader::Library->SetSettings ($settings_ref); >> - -C<< $meta_ref = Bootloader::Library->GetMetaData (); >> - -C<< $global_ref = Bootloader::Library->GetGlobalSettings (); >> - -C<< $status = Bootloader::Library->SetGlobalSettings ($global_settings_ref); >> - -C<< $sections_ref = Bootloader::Library->GetSections (); >> - -C<< $status = Bootloader::Library->SetSections ($sections_ref); >> - -C<< $device_map_ref = Bootloader::Library->GetDeviceMapping (); >> - -C<< $status = Bootloader::Library->SetDeviceMapping ($device_map_ref); >> - -C<< $unix_dev = Bootloader::Library->GrubDev2UnixDev ($grub_dev); >> - -C<< $result = Bootloader::Library::DetectThinkpadMBR ($disk); >> - -C<< $result = Bootloader::Library::WriteThinkpadMBR ($disk); >> - =head1 DESCRIPTION =over 2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.5.1/lib/Bootloader/Tools.pm new/perl-Bootloader-0.5.2/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.5.1/lib/Bootloader/Tools.pm 2009-04-29 16:08:01.000000000 +0200 +++ new/perl-Bootloader-0.5.2/lib/Bootloader/Tools.pm 2009-06-02 13:00:30.000000000 +0200 @@ -342,7 +342,11 @@ my @result = qx/$command/; # return if problems occurs...typical is not loaded kernel module if ( $? ) { - $logger->warning("Tools::GetMultipath: multipath command failed with $?"); + if ($result[0] =~ m/kernel driver not loaded/) { + $logger->info("Tools::GetMultipath: multipath kernel module is not loaded Ecode:$?."); + } else { + $logger->warning("Tools::GetMultipath: multipath command failed with $?."); + } return \%ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org