Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2015-07-05 17:51:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-06-06 09:53:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2015-07-05 17:51:27.000000000 +0200 @@ -1,0 +2,24 @@ +Tue Jun 23 17:11:06 CEST 2015 - [email protected] + +- do not prepend additional empty space to append (bsc#926426) +- 0.838 + +------------------------------------------------------------------- +Thu Jun 18 12:20:55 CEST 2015 - [email protected] + +- use proper upstream name for disabling recovery section (bsc#898099) +- 0.837 + +------------------------------------------------------------------- +Wed Jun 17 15:20:57 CEST 2015 - [email protected] + +- ensure to uncommend grub2 disabling option (fate#317016) +- 0.836 + +------------------------------------------------------------------- +Tue Jun 16 17:05:55 CEST 2015 - [email protected] + +- Allow to setup disabling of recovery section (fate#317016) +- 0.835 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.834.tar.xz New: ---- perl-Bootloader-0.838.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.fOPWiN/_old 2015-07-05 17:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.fOPWiN/_new 2015-07-05 17:51:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.834 +Version: 0.838 Release: 0 Requires: coreutils Requires: perl-base = %{perl_version} ++++++ perl-Bootloader-0.834.tar.xz -> perl-Bootloader-0.838.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.834/VERSION new/perl-Bootloader-0.838/VERSION --- old/perl-Bootloader-0.834/VERSION 2015-06-05 11:21:28.000000000 +0200 +++ new/perl-Bootloader-0.838/VERSION 2015-06-23 17:06:21.000000000 +0200 @@ -1 +1 @@ -0.834 +0.838 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.834/changelog new/perl-Bootloader-0.838/changelog --- old/perl-Bootloader-0.834/changelog 2015-06-05 11:21:28.000000000 +0200 +++ new/perl-Bootloader-0.838/changelog 2015-06-23 17:06:21.000000000 +0200 @@ -1,3 +1,15 @@ +2015-06-23: 0.838 + - do not prepend additional empty space to append (bnc #926426) + +2015-06-18: 0.837 + - use proper upstream name for disabling recovery section (bnc #898099) + +2015-06-17: 0.836 + - ensure to uncommend grub2 disabling option (fate #317016) + +2015-06-16: 0.835 + - Allow to setup disabling of recovery section (fate #317016) + 2015-06-03: 0.834 - Escape dollar signs (bsc#857556) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.834/src/Core/GRUB2.pm new/perl-Bootloader-0.838/src/Core/GRUB2.pm --- old/perl-Bootloader-0.834/src/Core/GRUB2.pm 2015-06-05 11:21:28.000000000 +0200 +++ new/perl-Bootloader-0.838/src/Core/GRUB2.pm 2015-06-23 17:06:21.000000000 +0200 @@ -807,6 +807,8 @@ $ret{"gfxtheme"} = $val; } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { $ret{"distributor"} = $val; + } elsif ($key =~ m/@?GRUB_DISABLE_RECOVERY/) { + $ret{"failsafe_disabled"} = $val; } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) { $ret{"append_failsafe"} = $val; } elsif ($key =~ m/@?GRUB_BACKGROUND/) { @@ -941,7 +943,7 @@ ], }, { - 'key' => '@GRUB_DISABLE_LINUX_RECOVERY', + 'key' => '@GRUB_DISABLE_RECOVERY', 'value' => 'true', 'comment_before' => [ '# Uncomment to disable generation of recovery mode menu entries' @@ -989,13 +991,13 @@ my $gfxtheme = delete $globinfo{"gfxtheme"} || ""; my $gfxbackground = delete $globinfo{"gfxbackground"} || ""; my $distributor = delete $globinfo{"distributor"} || ""; + my $failsafe_disabled = delete $globinfo{"failsafe_disabled"} || ""; my $append_failsafe = delete $globinfo{"append_failsafe"} || ""; my $os_prober = delete $globinfo{"os_prober"} || ""; my $suse_btrfs = delete $globinfo{"suse_btrfs"} || "true"; my $cryptodisk = delete $globinfo{"cryptodisk"} || 0; # $root = " root=$root" if $root ne ""; $vga = " vga=$vga" if $vga ne ""; - $append = " $append" if $append ne ""; $self->milestone("XXX append = $append"); $append =~ s/rootflags=subvol\S*\s*//; @@ -1080,6 +1082,13 @@ } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { $line_ref->{"value"} = "$distributor" if "$distributor" ne ""; $distributor = ""; + } elsif ($key =~ m/@?GRUB_DISABLE_RECOVERY$/) { + if ("$failsafe_disabled" ne "") { + # uncomment option + $line_ref->{"key"} = "GRUB_DISABLE_RECOVERY"; + $line_ref->{"value"} = "$failsafe_disabled"; + $failsafe_disabled = ""; + } } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) { $line_ref->{"value"} = "$append_failsafe" if "$append_failsafe" ne ""; $append_failsafe = ""; @@ -1167,6 +1176,13 @@ } } + if ("$failsafe_disabled" ne "") { + push @lines, { + "key" => "GRUB_DISABLE_RECOVERY", + "value" => "$failsafe_disabled", + } + } + if ("$append_failsafe" ne "") { push @lines, { "key" => "GRUB_CMDLINE_LINUX_RECOVERY", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.834/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.838/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.834/src/Core/GRUB2EFI.pm 2015-06-05 11:21:28.000000000 +0200 +++ new/perl-Bootloader-0.838/src/Core/GRUB2EFI.pm 2015-06-23 17:06:21.000000000 +0200 @@ -392,6 +392,8 @@ $ret{"gfxtheme"} = $val; } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { $ret{"distributor"} = $val; + } elsif ($key =~ m/@?GRUB_DISABLE_RECOVERY/) { + $ret{"failsafe_disabled"} = $val; } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) { $ret{"append_failsafe"} = $val; } elsif ($key =~ m/@?GRUB_BACKGROUND/) { @@ -525,7 +527,7 @@ ], }, { - 'key' => '@GRUB_DISABLE_LINUX_RECOVERY', + 'key' => '@GRUB_DISABLE_RECOVERY', 'value' => 'true', 'comment_before' => [ '# Uncomment to disable generation of recovery mode menu entries' @@ -581,13 +583,13 @@ my $gfxtheme = delete $globinfo{"gfxtheme"} || ""; my $gfxbackground = delete $globinfo{"gfxbackground"} || ""; my $distributor = delete $globinfo{"distributor"} || ""; + my $failsafe_disabled = delete $globinfo{"failsafe_disabled"} || ""; my $append_failsafe = delete $globinfo{"append_failsafe"} || ""; my $os_prober = delete $globinfo{"os_prober"} || ""; my $suse_btrfs = delete $globinfo{"suse_btrfs"} || "true"; my $cryptodisk = delete $globinfo{"cryptodisk"} || 0; # $root = " root=$root" if $root ne ""; $vga = " vga=$vga" if $vga ne ""; - $append = " $append" if $append ne ""; $self->milestone("XXX append = $append"); $append =~ s/rootflags=subvol\S*\s*//; @@ -672,6 +674,13 @@ } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { $line_ref->{"value"} = "$distributor" if "$distributor" ne ""; $distributor = ""; + } elsif ($key =~ m/@?GRUB_DISABLE_RECOVERY$/) { + if ("$failsafe_disabled" ne "") { + # uncomment option + $line_ref->{"key"} = "GRUB_DISABLE_RECOVERY"; + $line_ref->{"value"} = "$failsafe_disabled"; + $failsafe_disabled = ""; + } } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) { $line_ref->{"value"} = "$append_failsafe" if "$append_failsafe" ne ""; $append_failsafe = ""; @@ -760,6 +769,13 @@ } } + if ("$failsafe_disabled" ne "") { + push @lines, { + "key" => "GRUB_DISABLE_RECOVERY", + "value" => "$failsafe_disabled", + } + } + if ("$append_failsafe" ne "") { push @lines, { "key" => "GRUB_CMDLINE_LINUX_RECOVERY",
