From ad2f4819ea05e95f214a068bef0979aa835dcf776842276a7708962280d1ac92 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 23 Aug 2012 14:56:17 +0000 Subject: [PATCH] - rewite pbl's logging functions - start new version number scheme - 0.700 OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=68 --- perl-Bootloader-0.6.8.tar.bz2 | 3 -- perl-Bootloader-0.700.tar.bz2 | 3 ++ perl-Bootloader.changes | 7 ++++ perl-Bootloader.spec | 29 ++++---------- update-bootloader | 71 +++++++++++------------------------ 5 files changed, 39 insertions(+), 74 deletions(-) delete mode 100644 perl-Bootloader-0.6.8.tar.bz2 create mode 100644 perl-Bootloader-0.700.tar.bz2 diff --git a/perl-Bootloader-0.6.8.tar.bz2 b/perl-Bootloader-0.6.8.tar.bz2 deleted file mode 100644 index 0101710..0000000 --- a/perl-Bootloader-0.6.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6126184a9fac51dfd34b3d75de2d8f1463345aef41ff71c648ed6bd19e6c0e8f -size 153820 diff --git a/perl-Bootloader-0.700.tar.bz2 b/perl-Bootloader-0.700.tar.bz2 new file mode 100644 index 0000000..d8367b8 --- /dev/null +++ b/perl-Bootloader-0.700.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dc97ff8acc2e528eec44ebef046062c889772edbf1ed8808219d5d28a3b7477 +size 153311 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index 2a72651..9603e24 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 23 16:52:34 CEST 2012 - snwint@suse.de + +- rewite pbl's logging functions +- start new version number scheme +- 0.700 + ------------------------------------------------------------------- Mon Aug 20 14:06:18 CEST 2012 - mchang@suse.com diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index d697236..21ff261 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.6.8 +Version: 0.700 Release: 0 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -48,50 +48,35 @@ Authors: %prep %setup -q -rm -rf perl-Bootloader-testsuite -mkdir -p lib -mv src lib/Bootloader %build -touch Makefile.PL -perl -MExtUtils::MakeMaker -e 'WriteMakefile (NAME => "Bootloader")' -make %{?_smp_mflags} -pod2man %{SOURCE1} | gzip > update-bootloader.8.gz %install +make DESTDIR=$RPM_BUILD_ROOT install install -d -m 700 $RPM_BUILD_ROOT/var/log/YaST2 -make DESTDIR=$RPM_BUILD_ROOT install_vendor %perl_process_packlist -mkdir -p $RPM_BUILD_ROOT/sbin -install -m 755 %_sourcedir/update-bootloader $RPM_BUILD_ROOT/sbin -install -d -m 755 $RPM_BUILD_ROOT/usr/lib/bootloader -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader -install -d -m 755 $RPM_BUILD_ROOT/boot -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/boot/ -install -d -m 755 $RPM_BUILD_ROOT/usr/share/man/man8/ -install -m 644 update-bootloader.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/ #install only needed files for bootloader for specific architecture %ifarch %ix86 x86_64 -rm $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,PowerLILO*} -rm $RPM_BUILD_ROOT/%{_mandir}/man?/{*ZIPL*,*PowerLILO*} +rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,PowerLILO*} +rm -f $RPM_BUILD_ROOT/%{_mandir}/man?/{*ZIPL*,*PowerLILO*} %if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 sed -i '/ZIPL/D;/PowerLILO/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist %endif %endif %ifarch ppc ppc64 -rm $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,LILO*,ELILO*,GRUB*} +rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,LILO*,ELILO*,GRUB*} %if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 sed -i '/ZIPL/D;/ELILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist %endif %endif %ifarch s390 s390x -rm $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{*LILO*,GRUB*} +rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{*LILO*,GRUB*} %if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 sed -i '/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist %endif %endif %ifarch ia32 ia64 -rm $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{LILO*,GRUB*,ZIPL*,PowerLILO*} +rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{LILO*,GRUB*,ZIPL*,PowerLILO*} %if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 sed -i '/ZIPL/D;/PowerLILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist %endif diff --git a/update-bootloader b/update-bootloader index 7a05663..ffd609a 100644 --- a/update-bootloader +++ b/update-bootloader @@ -1,11 +1,11 @@ #! /usr/bin/perl +use strict; use POSIX; use Getopt::Long; + use Bootloader::Tools; -use Bootloader::Path; use Bootloader::MBRTools; -use strict; # keep Pod::Usage optional (bnc #760464) eval "use Pod::Usage"; @@ -167,10 +167,7 @@ sub test_gettext { return undef } -my $logname = Bootloader::Path::Logname(); -open (LOG, ">>$logname"); -print LOG ("update-bootloader called:\n" . $0 . " " . join (" ", @ARGV) . "\n"); -close LOG; +my $cmdline = join " ", ($0, @ARGV); GetOptions (\%oper, 'add|a' , @@ -201,8 +198,12 @@ die("Option 'default' is only allowed for operation 'add'\n") die("Option 'force-default' is only allowed for operation 'add'\n") if ($opt_force_default and not defined $oper{add}); +my $logger = Bootloader::Library->new(); + +$logger->milestone($cmdline); + if (defined $oper{"examinembr"}) { - my $ret = Bootloader::MBRTools::examineMBR($oper{"examinembr"}); + my $ret = $logger->examineMBR($oper{"examinembr"}); if (defined $ret){ print "$ret\n"; exit 0; @@ -213,18 +214,14 @@ if (defined $oper{"examinembr"}) { if (Bootloader::Tools::GetBootloader() eq "none") { - open (LOG, ">>$logname"); - print LOG ("none bootloader, skipped updating \n"); - close LOG; + $logger->milestone("none bootloader, skipped updating"); exit 0; } if (Bootloader::Tools::GetBootloader() =~ /^(grub2|grub2-efi)$/) { - open (LOG, ">>$logname"); - print LOG ("grub2 bootloader, no add/remove section support\n"); - close LOG; + $logger->milestone("grub2 bootloader, no add/remove section support"); delete $oper{add}; delete $oper{remove}; @@ -254,7 +251,6 @@ my $type = $opt_xen ? "xen" : "image"; InitLibrary(); - if ($opt_previous) { unless ($opt_image) { $opt_image = GetDefaultImage() . ".previous"; @@ -315,10 +311,7 @@ if (defined $oper{add}) { chomp ($opt_trans); #log what is translated - my $logname = Bootloader::Path::Logname(); - open (LOG, ">>$logname"); - print LOG ("translate :\n" . $0 . " " . join (" ", @ARGV) . "\n"); - close LOG; + $logger->milestone("translate :\n" . $0 . " " . join (" ", @ARGV)); # check whether translation only contains [a-zA-Z0-9 _] # otherwise fall back to untranslated string @@ -385,10 +378,8 @@ if (defined $oper{add}) { # execute selected operation # if (defined $oper{add}) { - open (LOG, ">>$logname"); - print LOG ("update-bootloader: now executing operation add\n"); - print LOG ("update-bootloader: changed opt name is $opt_name\n"); - close LOG; + $logger->milestone("update-bootloader: now executing operation add"); + $logger->milestone("update-bootloader: changed opt name is $opt_name"); die("Please specify name and kernel image for new section\n") unless $opt_name and $opt_image; @@ -401,9 +392,7 @@ if (defined $oper{add}) { if (not $opt_force) { die("There are already sections with image '$opt_image'\n"); } - open (LOG, ">>$logname"); - print LOG ("update-bootloader: section already exist. Skip add.\n"); - close LOG; + $logger->milestone("update-bootloader: section already exist. Skip add."); } else { # If, if option $opt_force_default is set, let this new kernel be @@ -437,9 +426,7 @@ if (defined $oper{add}) { # Add original_name to params to be able to create comment line push @params, original_name => "xen"; - open (LOG, ">>$logname"); - print LOG ("update-bootloader: calling Tools::AddSection (XEN)\n"); - close LOG; + $logger->milestone("update-bootloader: calling Tools::AddSection (XEN)"); AddSection($opt_xen_name, @params); } @@ -448,9 +435,7 @@ if (defined $oper{add}) { # Add original_name to params to be able to create comment line push @params, original_name => "linux"; - open (LOG, ">>$logname"); - print LOG ("update-bootloader: calling Tools::AddSection (normal)\n"); - close LOG; + $logger->milestone("update-bootloader: calling Tools::AddSection (normal)"); AddSection($opt_name, @params); } @@ -474,9 +459,7 @@ if (defined $oper{add}) { # Add original_name to params to be able to create comment line push @params, original_name => "failsafe"; - open (LOG, ">>$logname"); - print LOG ("update-bootloader: calling Tools::AddSection (failsafe)\n"); - close LOG; + $logger->milestone("update-bootloader: calling Tools::AddSection (failsafe)"); AddSection($opt_failsafe, @params); } @@ -492,34 +475,24 @@ if (defined $oper{remove}) { push @params, initrd => $opt_initrd if $opt_initrd; push @params, name => $opt_name if $opt_name; - open (LOG, ">>$logname"); - print LOG ("update-bootloader: now executing operation remove\n"); - close LOG; + $logger->milestone("update-bootloader: now executing operation remove"); my $num = CountSections(@params); if ($num > 0) { if ($num > 1 and not $opt_force) { - open (LOG, ">>$logname"); - print LOG ("update-bootloader: found $num sections, no opt_force: not removing\n"); - close LOG; + $logger->milestone("update-bootloader: found $num sections, no opt_force: not removing"); die("There is more than one section with image '$opt_image'\n"); } else { - open (LOG, ">>$logname"); - print LOG ("update-bootloader: calling Tools::RemoveSections\n"); - close LOG; + $logger->milestone("update-bootloader: calling Tools::RemoveSections"); RemoveSections(@params); } } else { - open (LOG, ">>$logname"); - print LOG ("update-bootloader: no $opt_image found\n"); - close LOG; + $logger->milestone("update-bootloader: no $opt_image found"); } - open (LOG, ">>$logname"); - print LOG ("update-bootloader: finished operation remove\n"); - close LOG; + $logger->milestone("update-bootloader: finished operation remove"); }