pool/perl-Bootloader
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- rewite pbl's logging functions

Browse Source 
- start new version number scheme
- 0.700

OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=68
This commit is contained in:
Steffen Winterfeldt 2012-08-23 14:56:17 +00:00 committed by Git OBS Bridge
parent e8a881139b
commit ad2f4819ea
5 changed files with 39 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
perl-Bootloader-0.6.8.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6126184a9fac51dfd34b3d75de2d8f1463345aef41ff71c648ed6bd19e6c0e8f
size 153820

3
perl-Bootloader-0.700.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dc97ff8acc2e528eec44ebef046062c889772edbf1ed8808219d5d28a3b7477
size 153311

7
perl-Bootloader.changes
View File

@ -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 Mon Aug 20 14:06:18 CEST 2012 - mchang@suse.com

29
perl-Bootloader.spec
View File

@ -17,7 +17,7 @@
Name: perl-Bootloader Name: perl-Bootloader
Version: 0.6.8 Version: 0.700
Release: 0 Release: 0
Requires: perl-base = %{perl_version} Requires: perl-base = %{perl_version}
Requires: e2fsprogs Requires: e2fsprogs
@ -48,50 +48,35 @@ Authors:
%prep %prep
%setup -q %setup -q
rm -rf perl-Bootloader-testsuite
mkdir -p lib
mv src lib/Bootloader
%build %build
touch Makefile.PL
perl -MExtUtils::MakeMaker -e 'WriteMakefile (NAME => "Bootloader")'
make %{?_smp_mflags}
pod2man %{SOURCE1} | gzip > update-bootloader.8.gz
%install %install
make DESTDIR=$RPM_BUILD_ROOT install
install -d -m 700 $RPM_BUILD_ROOT/var/log/YaST2 install -d -m 700 $RPM_BUILD_ROOT/var/log/YaST2
make DESTDIR=$RPM_BUILD_ROOT install_vendor
%perl_process_packlist %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 #install only needed files for bootloader for specific architecture
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
rm $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,PowerLILO*} rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,PowerLILO*}
rm $RPM_BUILD_ROOT/%{_mandir}/man?/{*ZIPL*,*PowerLILO*} rm -f $RPM_BUILD_ROOT/%{_mandir}/man?/{*ZIPL*,*PowerLILO*}
%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 %if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130
sed -i '/ZIPL/D;/PowerLILO/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist sed -i '/ZIPL/D;/PowerLILO/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist
%endif %endif
%endif %endif
%ifarch ppc ppc64 %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 %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 sed -i '/ZIPL/D;/ELILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist
%endif %endif
%endif %endif
%ifarch s390 s390x %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 %if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130
sed -i '/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist sed -i '/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist
%endif %endif
%endif %endif
%ifarch ia32 ia64 %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 %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 sed -i '/ZIPL/D;/PowerLILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist
%endif %endif

71
update-bootloader
View File

@ -1,11 +1,11 @@
#! /usr/bin/perl #! /usr/bin/perl
use strict;
use POSIX; use POSIX;
use Getopt::Long; use Getopt::Long;
use Bootloader::Tools; use Bootloader::Tools;
use Bootloader::Path;
use Bootloader::MBRTools; use Bootloader::MBRTools;
use strict;
# keep Pod::Usage optional (bnc #760464) # keep Pod::Usage optional (bnc #760464)
eval "use Pod::Usage"; eval "use Pod::Usage";
@ -167,10 +167,7 @@ sub test_gettext {
return undef return undef
} }
my $logname = Bootloader::Path::Logname(); my $cmdline = join " ", ($0, @ARGV);
open (LOG, ">>$logname");
print LOG ("update-bootloader called:\n" . $0 . " " . join (" ", @ARGV) . "\n");
close LOG;
GetOptions (\%oper, GetOptions (\%oper,
'add|a' , '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") die("Option 'force-default' is only allowed for operation 'add'\n")
if ($opt_force_default and not defined $oper{add}); if ($opt_force_default and not defined $oper{add});
my $logger = Bootloader::Library->new();
$logger->milestone($cmdline);
if (defined $oper{"examinembr"}) { if (defined $oper{"examinembr"}) {
my $ret = Bootloader::MBRTools::examineMBR($oper{"examinembr"}); my $ret = $logger->examineMBR($oper{"examinembr"});
if (defined $ret){ if (defined $ret){
print "$ret\n"; print "$ret\n";
exit 0; exit 0;
@ -213,18 +214,14 @@ if (defined $oper{"examinembr"}) {
if (Bootloader::Tools::GetBootloader() eq "none") if (Bootloader::Tools::GetBootloader() eq "none")
{ {
open (LOG, ">>$logname"); $logger->milestone("none bootloader, skipped updating");
print LOG ("none bootloader, skipped updating \n");
close LOG;
exit 0; exit 0;
} }
if (Bootloader::Tools::GetBootloader() =~ /^(grub2|grub2-efi)$/) if (Bootloader::Tools::GetBootloader() =~ /^(grub2|grub2-efi)$/)
{ {
open (LOG, ">>$logname"); $logger->milestone("grub2 bootloader, no add/remove section support");
print LOG ("grub2 bootloader, no add/remove section support\n");
close LOG;
delete $oper{add}; delete $oper{add};
delete $oper{remove}; delete $oper{remove};
@ -254,7 +251,6 @@ my $type = $opt_xen ? "xen" : "image";
InitLibrary(); InitLibrary();
if ($opt_previous) { if ($opt_previous) {
unless ($opt_image) { unless ($opt_image) {
$opt_image = GetDefaultImage() . ".previous"; $opt_image = GetDefaultImage() . ".previous";
@ -315,10 +311,7 @@ if (defined $oper{add}) {
chomp ($opt_trans); chomp ($opt_trans);
#log what is translated #log what is translated
my $logname = Bootloader::Path::Logname(); $logger->milestone("translate :\n" . $0 . " " . join (" ", @ARGV));
open (LOG, ">>$logname");
print LOG ("translate :\n" . $0 . " " . join (" ", @ARGV) . "\n");
close LOG;
# check whether translation only contains [a-zA-Z0-9 _] # check whether translation only contains [a-zA-Z0-9 _]
# otherwise fall back to untranslated string # otherwise fall back to untranslated string
@ -385,10 +378,8 @@ if (defined $oper{add}) {
# execute selected operation # execute selected operation
# #
if (defined $oper{add}) { if (defined $oper{add}) {
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: now executing operation add");
print LOG ("update-bootloader: now executing operation add\n"); $logger->milestone("update-bootloader: changed opt name is $opt_name");
print LOG ("update-bootloader: changed opt name is $opt_name\n");
close LOG;
die("Please specify name and kernel image for new section\n") die("Please specify name and kernel image for new section\n")
unless $opt_name and $opt_image; unless $opt_name and $opt_image;
@ -401,9 +392,7 @@ if (defined $oper{add}) {
if (not $opt_force) { if (not $opt_force) {
die("There are already sections with image '$opt_image'\n"); die("There are already sections with image '$opt_image'\n");
} }
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: section already exist. Skip add.");
print LOG ("update-bootloader: section already exist. Skip add.\n");
close LOG;
} else { } else {
# If, if option $opt_force_default is set, let this new kernel be # 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 # Add original_name to params to be able to create comment line
push @params, original_name => "xen"; push @params, original_name => "xen";
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: calling Tools::AddSection (XEN)");
print LOG ("update-bootloader: calling Tools::AddSection (XEN)\n");
close LOG;
AddSection($opt_xen_name, @params); 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 # Add original_name to params to be able to create comment line
push @params, original_name => "linux"; push @params, original_name => "linux";
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: calling Tools::AddSection (normal)");
print LOG ("update-bootloader: calling Tools::AddSection (normal)\n");
close LOG;
AddSection($opt_name, @params); AddSection($opt_name, @params);
} }
@ -474,9 +459,7 @@ if (defined $oper{add}) {
# Add original_name to params to be able to create comment line # Add original_name to params to be able to create comment line
push @params, original_name => "failsafe"; push @params, original_name => "failsafe";
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: calling Tools::AddSection (failsafe)");
print LOG ("update-bootloader: calling Tools::AddSection (failsafe)\n");
close LOG;
AddSection($opt_failsafe, @params); AddSection($opt_failsafe, @params);
} }
@ -492,34 +475,24 @@ if (defined $oper{remove}) {
push @params, initrd => $opt_initrd if $opt_initrd; push @params, initrd => $opt_initrd if $opt_initrd;
push @params, name => $opt_name if $opt_name; push @params, name => $opt_name if $opt_name;
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: now executing operation remove");
print LOG ("update-bootloader: now executing operation remove\n");
close LOG;
my $num = CountSections(@params); my $num = CountSections(@params);
if ($num > 0) { if ($num > 0) {
if ($num > 1 and not $opt_force) { if ($num > 1 and not $opt_force) {
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: found $num sections, no opt_force: not removing");
print LOG ("update-bootloader: found $num sections, no opt_force: not removing\n");
close LOG;
die("There is more than one section with image '$opt_image'\n"); die("There is more than one section with image '$opt_image'\n");
} else { } else {
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: calling Tools::RemoveSections");
print LOG ("update-bootloader: calling Tools::RemoveSections\n");
close LOG;
RemoveSections(@params); RemoveSections(@params);
} }
} else { } else {
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: no $opt_image found");
print LOG ("update-bootloader: no $opt_image found\n");
close LOG;
} }
open (LOG, ">>$logname"); $logger->milestone("update-bootloader: finished operation remove");
print LOG ("update-bootloader: finished operation remove\n");
close LOG;
} }