Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2014-01-17 11:06:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2014-01-14 16:35:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2014-01-23 15:51:13.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 16 16:41:54 CET 2014 - [email protected] + +- workaround to avoid double rootflags entries +- 0.802 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.801.tar.xz New: ---- perl-Bootloader-0.802.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.R5BTRp/_old 2014-01-23 15:51:14.000000000 +0100 +++ /var/tmp/diff_new_pack.R5BTRp/_new 2014-01-23 15:51:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.801 +Version: 0.802 Release: 0 Requires: coreutils Requires: e2fsprogs ++++++ perl-Bootloader-0.801.tar.xz -> perl-Bootloader-0.802.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.801/perl-Bootloader.changes new/perl-Bootloader-0.802/perl-Bootloader.changes --- old/perl-Bootloader-0.801/perl-Bootloader.changes 2014-01-14 14:13:16.000000000 +0100 +++ new/perl-Bootloader-0.802/perl-Bootloader.changes 2014-01-16 16:42:25.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 16 16:41:54 CET 2014 - [email protected] + +- workaround to avoid double rootflags entries +- 0.802 + +------------------------------------------------------------------- Tue Jan 14 14:12:44 CET 2014 - [email protected] - fix confusion between Tools::GetDeviceMapping() and Core::GetDeviceMapping() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.801/src/Core/GRUB2.pm new/perl-Bootloader-0.802/src/Core/GRUB2.pm --- old/perl-Bootloader-0.801/src/Core/GRUB2.pm 2014-01-13 13:48:40.000000000 +0100 +++ new/perl-Bootloader-0.802/src/Core/GRUB2.pm 2014-01-16 16:41:16.000000000 +0100 @@ -348,11 +348,24 @@ # list<string> ListFiles () sub ListFiles { my $self = shift; - my @ret = ( Bootloader::Path::Grub2_installdevice(), - Bootloader::Path::Grub2_defaultconf() ); + my @ret = (); + + if (-e Bootloader::Path::Grub2_installdevice()) { + push @ret, Bootloader::Path::Grub2_installdevice(); + } else { + $self->warning ("file not exist ".Bootloader::Path::Grub2_installdevice()); + } + + if (-e Bootloader::Path::Grub2_defaultconf()) { + push @ret, Bootloader::Path::Grub2_defaultconf(); + } else { + $self->warning ("file not exist ".Bootloader::Path::Grub2_defaultconf()); + } if (-e Bootloader::Path::Grub2_conf()) { push @ret, Bootloader::Path::Grub2_conf(); + } else { + $self->warning ("file not exist ".Bootloader::Path::Grub2_conf()); } return \@ret; @@ -399,15 +412,16 @@ \@defaultconf ); + my @devices = @{$files{Bootloader::Path::Grub2_installdevice()} || []}; + if (not exists $self->{"mountpoints"}{'/'}) { $self->milestone("Mount points doesn't have '/', skipped parsing grub2 config"); + } + elsif (scalar (@devices) == 0) + { + $self->warning("No device configured, skip parsing boot device"); } else { - # FIXME: Need to figure our a better way to get the - # device, otherwise user may break setup if they - # call install script directly - my @devices = @{$files{Bootloader::Path::Grub2_installdevice()} || []}; - # FIXME: still incomplete for MD and dmraid devs # translate device array to the various boot_* flags else set boot_custom # in glob_ref accordingly @@ -923,6 +937,9 @@ $vga = " vga=$vga" if $vga ne ""; $append = " $append" if $append ne ""; + $self->milestone("XXX append = $append"); + $append =~ s/rootflags=subvol\S*\s*//; + my $hidden_timeout = "$timeout"; if ("$hiddenmenu" eq "true") { $timeout = "0" if "$timeout" ne ""; @@ -1093,6 +1110,12 @@ my $sections = $ret->{"sections"}; my $globals = $ret->{"global"}; + + if (! -e "/usr/sbin/grub2-editenv") { + $self->warning ("file not exist /usr/sbin/grub2-editenv"); + return $ret; + } + my $saved_entry = `/usr/bin/grub2-editenv list|sed -n '/^saved_entry=/s/.*=//p'`; chomp $saved_entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.801/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.802/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.801/src/Core/GRUB2EFI.pm 2014-01-13 13:48:40.000000000 +0100 +++ new/perl-Bootloader-0.802/src/Core/GRUB2EFI.pm 2014-01-16 16:43:02.000000000 +0100 @@ -156,10 +156,18 @@ # list<string> ListFiles () sub ListFiles { my $self = shift; - my @ret = (Bootloader::Path::Grub2_defaultconf()); + my @ret = (); + + if (-e Bootloader::Path::Grub2_defaultconf()) { + push @ret, Bootloader::Path::Grub2_defaultconf(); + } else { + $self->warning ("file not exist ".Bootloader::Path::Grub2_defaultconf()); + } if (-e Bootloader::Path::Grub2_conf()) { push @ret, Bootloader::Path::Grub2_conf(); + } else { + $self->warning ("file not exist ".Bootloader::Path::Grub2_conf()); } return \@ret; @@ -504,6 +512,9 @@ $vga = " vga=$vga" if $vga ne ""; $append = " $append" if $append ne ""; + $self->milestone("XXX append = $append"); + $append =~ s/rootflags=subvol\S*\s*//; + my $hidden_timeout = "$timeout"; if ("$hiddenmenu" eq "true") { $timeout = "0" if "$timeout" ne ""; @@ -691,6 +702,12 @@ my $sections = $ret->{"sections"}; my $globals = $ret->{"global"}; + + if (! -e "/usr/sbin/grub2-editenv") { + $self->warning ("file not exist /usr/sbin/grub2-editenv"); + return $ret; + } + my $saved_entry = `/usr/bin/grub2-editenv list|sed -n '/^saved_entry=/s/.*=//p'`; chomp $saved_entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.801/update-bootloader new/perl-Bootloader-0.802/update-bootloader --- old/perl-Bootloader-0.801/update-bootloader 2014-01-13 13:48:40.000000000 +0100 +++ new/perl-Bootloader-0.802/update-bootloader 2014-01-16 10:51:45.000000000 +0100 @@ -249,6 +249,13 @@ exit 0; } +if (Bootloader::Tools::GetBootloader() =~ /^(grub2|grub2-efi)$/ and + !-x "/usr/sbin/grub2-mkconfig") +{ + $logger->milestone("grub2 utilties not in place, skipped updating"); + exit 0; +} + if ($opt_image and $opt_image !~ m;^/;) { $opt_image = getcwd . '/' . $opt_image } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.801/version new/perl-Bootloader-0.802/version --- old/perl-Bootloader-0.801/version 2014-01-14 14:12:28.000000000 +0100 +++ new/perl-Bootloader-0.802/version 2014-01-16 16:41:48.000000000 +0100 @@ -1 +1 @@ -0.801 +0.802 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.801/version~ new/perl-Bootloader-0.802/version~ --- old/perl-Bootloader-0.801/version~ 1970-01-01 01:00:00.000000000 +0100 +++ new/perl-Bootloader-0.802/version~ 2014-01-14 14:12:28.000000000 +0100 @@ -0,0 +1 @@ +0.801 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
