Hello community, here is the log from the commit of package perl-Bootloader checked in at Mon Aug 6 22:36:39 CEST 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-07-23 17:18:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-08-06 15:53:33.000000000 +0200 @@ -1,0 +2,59 @@ +Mon Aug 6 15:51:28 CEST 2007 - aosthof@suse.de + +- Adapted yast2-bootloader-style comments to be correctly detected + by yast2-bootloader (fate #302407) + +------------------------------------------------------------------- +Thu Aug 2 14:25:22 CEST 2007 - aosthof@suse.de + +- Determine md device corresponding to md member device, e.g. + if /dev/md0 consists of /dev/sda1 and /dev/sda2, then /dev/md0 + corresponds to both /dev/sda1 and /dev/sda2 (#271797) + +------------------------------------------------------------------- +Wed Aug 1 17:31:42 CEST 2007 - aosthof@suse.de + +- Adapt function DumpLog() to only write to perl-BL-standalone-log, + because against expectations yast2-bootloader does logging of + called perl-Bootloader functions on its own + +------------------------------------------------------------------- +Wed Aug 1 11:09:18 CEST 2007 - aosthof@suse.de + +- Added milestones to functions AddSection() and RemoveSections() + to print new section entries, already existing section entries + and section entries to be removed + +------------------------------------------------------------------- +Wed Aug 1 11:07:52 CEST 2007 - aosthof@suse.de + +- Improved logging mechanism to write log messages either to + /var/log/YaST2/y2log or to /var/log/YaST2/perl-BL-standalone-log, + depending on the state of the environment variable + YAST_IS_RUNNING. In addition to that, the printing of log + messages with level DEBUG can be switched on/off by + setting/unsetting the environment variable Y2DEBUG. + +------------------------------------------------------------------- +Mon Jul 30 14:28:34 CEST 2007 - aosthof@suse.de + +- Use small letters in YaST-style comments due to case sensitive + parser (#283709) + +------------------------------------------------------------------- +Mon Jul 30 13:49:03 CEST 2007 - aosthof@suse.de + +- Version bump to 0.4.18 + +------------------------------------------------------------------- +Mon Jul 30 11:13:17 CEST 2007 - aosthof@suse.de + +- Avoid duplicate entries in elilo.conf (#294717) + +------------------------------------------------------------------- +Mon Jul 30 10:18:05 CEST 2007 - aosthof@suse.de + +- Added yast2-bootloader-style comment to sections created by + perl-Bootloader (bug #283709 and fate #302407) + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.17.tar.bz2 New: ---- perl-Bootloader-0.4.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.I11065/_old 2007-08-06 22:35:38.000000000 +0200 +++ /var/tmp/diff_new_pack.I11065/_new 2007-08-06 22:35:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.17) +# spec file for package perl-Bootloader (Version 0.4.18) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.17 -Release: 6 +Version: 0.4.18 +Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: mdadm e2fsprogs @@ -66,6 +66,38 @@ /usr/lib/bootloader %changelog +* Mon Aug 06 2007 - aosthof@suse.de +- Adapted yast2-bootloader-style comments to be correctly detected + by yast2-bootloader (fate #302407) +* Thu Aug 02 2007 - aosthof@suse.de +- Determine md device corresponding to md member device, e.g. + if /dev/md0 consists of /dev/sda1 and /dev/sda2, then /dev/md0 + corresponds to both /dev/sda1 and /dev/sda2 (#271797) +* Wed Aug 01 2007 - aosthof@suse.de +- Adapt function DumpLog() to only write to perl-BL-standalone-log, + because against expectations yast2-bootloader does logging of + called perl-Bootloader functions on its own +* Wed Aug 01 2007 - aosthof@suse.de +- Added milestones to functions AddSection() and RemoveSections() + to print new section entries, already existing section entries + and section entries to be removed +* Wed Aug 01 2007 - aosthof@suse.de +- Improved logging mechanism to write log messages either to + /var/log/YaST2/y2log or to /var/log/YaST2/perl-BL-standalone-log, + depending on the state of the environment variable + YAST_IS_RUNNING. In addition to that, the printing of log + messages with level DEBUG can be switched on/off by + setting/unsetting the environment variable Y2DEBUG. +* Mon Jul 30 2007 - aosthof@suse.de +- Use small letters in YaST-style comments due to case sensitive + parser (#283709) +* Mon Jul 30 2007 - aosthof@suse.de +- Version bump to 0.4.18 +* Mon Jul 30 2007 - aosthof@suse.de +- Avoid duplicate entries in elilo.conf (#294717) +* Mon Jul 30 2007 - aosthof@suse.de +- Added yast2-bootloader-style comment to sections created by + perl-Bootloader (bug #283709 and fate #302407) * Mon Jul 23 2007 - aosthof@suse.de - Fixed boot entries of self compiled kernels (#265564) * Thu Jul 12 2007 - aosthof@suse.de ++++++ perl-Bootloader-0.4.17.tar.bz2 -> perl-Bootloader-0.4.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.17/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.18/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.4.17/lib/Bootloader/Core/GRUB.pm 2007-07-12 17:38:27.000000000 +0200 +++ new/perl-Bootloader-0.4.18/lib/Bootloader/Core/GRUB.pm 2007-08-02 14:31:00.000000000 +0200 @@ -1831,6 +1831,19 @@ my @devices = (); my $device = $self->GrubDev2UnixDev($grub_dev); + # MD-RAID handling: find the corresponding /dev/mdX if any. + while ((my $md, my $members_ref) = each (%{$self->{"md_arrays"}})) { + + my $members = join ", ", @{$members_ref}; + $self->l_debug ("GRUB::GrubDev2MountPoint : MD Array: $md ; Members: $members"); + + foreach my $md_member (@{$members_ref}) { + if ($device eq $md_member) { + push (@devices, $md); + } + } + } + push (@devices, $device); #FIXME: sf@ need handling for /dev/dm-X devices here diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.17/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.18/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.4.17/lib/Bootloader/Tools.pm 2007-07-06 10:33:41.000000000 +0200 +++ new/perl-Bootloader-0.4.18/lib/Bootloader/Tools.pm 2007-08-01 17:32:06.000000000 +0200 @@ -100,32 +100,65 @@ my $dmsetup = undef; sub DumpLog { + my $perl_logfile = "/var/log/YaST2/perl-BL-standalone-log"; + my $using_logfile = 1; + + if (not open LOGFILE, ">>$perl_logfile") { + $using_logfile = 0; + open LOGFILE, ">&STDERR" or die "Can’t dup STDERR: $!"; + print LOGFILE ("WARNING: Can't open $perl_logfile, using STDERR instead.\n"); + } + foreach my $rec (@{$lib_ref->GetLogRecords ()}) { my $message = $rec->{"message"}; my $level = $rec->{"level"}; - if ($level eq "debug") + + # If debug messages should be printed, the environment variable + # Y2DEBUG has to be set ("export Y2DEBUG=1"). + if ($level eq "debug" and defined $ENV{'Y2DEBUG'}) { -# print STDERR ("DEBUG: $message\n"); + print LOGFILE ("DEBUG: $message\n"); + } + elsif ($level eq "debug" and not defined $ENV{'Y2DEBUG'}) + { + # Omit debug messages } elsif ($level eq "milestone") { -# print STDERR ("MILESTONE: $message\n"); + print LOGFILE ("MILESTONE: $message\n"); } elsif ($level eq "warning") { - print STDERR ("WARNING: $message\n"); + print LOGFILE ("WARNING: $message\n"); + + # If writing to perl logfile, also print warnings to STDERR + if ($using_logfile) { + print STDERR ("WARNING: $message\n"); + } } elsif ($level eq "error") { - print STDERR ("ERROR: $message\n"); + print LOGFILE ("ERROR: $message\n"); + + # If writing to perl logfile, also print errors to STDERR + if ($using_logfile) { + print STDERR ("ERROR: $message\n"); + } } else { - print STDERR ("ERROR: Uncomplete log record\n"); - print STDERR ("ERROR: $message\n"); + print LOGFILE ("ERROR: Uncomplete log record\n"); + print LOGFILE ("ERROR: $message\n"); + + # If writing to perl logfile, also print errors to STDERR + if ($using_logfile) { + print STDERR ("ERROR: Uncomplete log record\n"); + print STDERR ("ERROR: $message\n"); + } } } + close LOGFILE; } sub ResolveCrossDeviceSymlinks { @@ -1145,6 +1178,16 @@ } } + my $core_lib = $lib_ref->{"loader"}; + + # Print new section to be added to logfile + $core_lib->l_milestone ("Tools::AddSection: New section to be added :\n\n' " . + join("'\n' ", + map { + $_ . " => '" . $new{$_} . "'"; + } keys %new) . "'\n" + ); + # Put new entries on top unshift @sections, \%new; @@ -1268,6 +1311,21 @@ unshift @sections, $normal_entry; } + # Print all available sections to logfile + $core_lib->l_milestone ( + "Tools::AddSection: All available sections (including new ones):\n"); + + my $section_count = 1; + foreach my $s (@sections) { + $core_lib->l_milestone ("$section_count. section :\n' " . + join("'\n' ", + map { + m/^__/ ? () : $_ . " => '" . $s->{$_} . "'"; + } keys %{$s}) . "'\n" + ); + $section_count++; + } + $lib_ref->SetSections (\@sections); # If the former default boot entry is updated, the new one will become now @@ -1293,6 +1351,14 @@ $lib_ref->SetGlobalSettings ($glob_ref); } + # Print globals to logfile + $core_lib->l_milestone ("Tools::AddSection: Global section of config :\n\n' " . + join("'\n' ", + map { + m/^__/ ? () : $_ . " => '" . $glob_ref->{$_} . "'"; + } keys %{$glob_ref}) . "'\n" + ); + $lib_ref->WriteSettings (1); $lib_ref->UpdateBootloader (1); # avoid initialization but write config to # the right place @@ -1365,6 +1431,31 @@ } =cut + my $core_lib = $lib_ref->{"loader"}; + + # Print section to be removed to logfile + $core_lib->l_milestone ("Tools::RemoveSections: Old section to be removed :\n\n' " . + join("'\n' ", + map { + $_ . " => '" . $option{$_} . "'"; + } keys %option) . "'\n" + ); + + # Print all available sections (before removal) to logfile + $core_lib->l_milestone ( + "Tools::RemoveSections: All available sections (before removal):\n"); + + my $section_count = 1; + foreach my $s (@sections) { + $core_lib->l_milestone ("$section_count. section :\n' " . + join("'\n' ", + map { + m/^__/ ? () : $_ . " => '" . $s->{$_} . "'"; + } keys %{$s}) . "'\n" + ); + $section_count++; + } + normalize_options(\%option); @sections = grep { my $match = match_section($_, \%option); @@ -1401,6 +1492,21 @@ } @sections; } + # Print all available sections (after removal) to logfile + $core_lib->l_milestone ( + "Tools::RemoveSections: All available sections (after removal):\n"); + + $section_count = 1; + foreach my $s (@sections) { + $core_lib->l_milestone ("$section_count. section :\n' " . + join("'\n' ", + map { + m/^__/ ? () : $_ . " => '" . $s->{$_} . "'"; + } keys %{$s}) . "'\n" + ); + $section_count++; + } + $lib_ref->SetSections (\@sections); if ($default_removed) { $glob_ref->{"default"} = $sections[0]{"name"}; ++++++ update-bootloader ++++++ --- perl-Bootloader/update-bootloader 2007-07-23 17:18:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/update-bootloader 2007-08-06 15:53:33.000000000 +0200 @@ -128,6 +128,7 @@ if ($found){ if ($loader ne "grub") { $namever = $product_query[$i+1]; + $namever =~ s/\s/_/g; } else{ $namever = $product_query[$i+2]; @@ -345,12 +346,25 @@ push @params, xen => $opt_xen_kernel if $type eq "xen"; push @params, initrd => $opt_initrd if $opt_initrd; + # If logfile already exists, remove it to prevent duplicate info + my $perl_logfile = "/var/log/YaST2/perl-BL-standalone-log"; + + if (-e $perl_logfile) { + `rm $perl_logfile`; + } + + # Add "xen" section if ($opt_xen) { - # Add "xen" section + # Add original_name to params to be able to create comment line + push @params, original_name => "xen"; + AddSection($opt_xen_name, @params); } + # Add "normal" section else { - # Add "normal" sections + # Add original_name to params to be able to create comment line + push @params, original_name => "linux"; + AddSection($opt_name, @params); } @@ -367,6 +381,9 @@ ($opt_image =~ /-smp/) || ($opt_image =~ /-bigsmp/)) && ($opt_xen != 1)) { + # Add original_name to params to be able to create comment line + push @params, original_name => "failsafe"; + AddSection($opt_failsafe, @params); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org