From 944a1b2bad7ff4a3494ed77462b3ecfb702e08bf49c3dced3fddc5e382335035 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 6 Aug 2007 20:36:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-Bootloader?expand=0&rev=14 --- perl-Bootloader-0.4.17.tar.bz2 | 3 -- perl-Bootloader-0.4.18.tar.bz2 | 3 ++ perl-Bootloader.changes | 59 ++++++++++++++++++++++++++++++++++ perl-Bootloader.spec | 38 ++++++++++++++++++++-- update-bootloader | 21 ++++++++++-- 5 files changed, 116 insertions(+), 8 deletions(-) delete mode 100644 perl-Bootloader-0.4.17.tar.bz2 create mode 100644 perl-Bootloader-0.4.18.tar.bz2 diff --git a/perl-Bootloader-0.4.17.tar.bz2 b/perl-Bootloader-0.4.17.tar.bz2 deleted file mode 100644 index f402be4..0000000 --- a/perl-Bootloader-0.4.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f7a2d6a8d71a80580bfab18473bb21f95095452d7c0bf1cd9fdbe9e37693e05 -size 46675 diff --git a/perl-Bootloader-0.4.18.tar.bz2 b/perl-Bootloader-0.4.18.tar.bz2 new file mode 100644 index 0000000..d1ed0ea --- /dev/null +++ b/perl-Bootloader-0.4.18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:088176c71a6813fa7336591c9531971921c6722fdcdda2f4b0d3af94684c9cf7 +size 47298 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index 6962338..59908f6 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +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) + ------------------------------------------------------------------- Mon Jul 23 17:15:10 CEST 2007 - aosthof@suse.de diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index c742695..92a75be 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -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 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /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 diff --git a/update-bootloader b/update-bootloader index 92b3b8c..0846aa3 100644 --- a/update-bootloader +++ b/update-bootloader @@ -128,6 +128,7 @@ sub GetProduct { 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 @@ if (defined $oper{add}) { 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 @@ if (defined $oper{add}) { ($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); } }