Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2014-04-05 14:43:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-05 15:36:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2014-04-05 14:43:09.000000000 +0200 @@ -1,0 +2,25 @@ +Thu Apr 3 14:16:07 CEST 2014 - [email protected] + +- fix ppc install (bnc #871691) +- 0.810 + +------------------------------------------------------------------- +Thu Apr 3 09:09:37 CEST 2014 - [email protected] + +- don't forget to update device.map (bnc #869083) +- 0.809 + +------------------------------------------------------------------- +Tue Apr 1 09:43:57 UTC 2014 - [email protected] + +- enable SUSE_BTRFS_SNAPSHOT_BOOTING on x86 as other architectures + are working in progress. +- 0.808 + +------------------------------------------------------------------- +Mon Mar 31 12:18:44 UTC 2014 - [email protected] + +- support snapper rollback (fate##317062) +- 0.807 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.806.tar.xz New: ---- perl-Bootloader-0.810.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.d7S9J2/_old 2014-04-05 14:43:09.000000000 +0200 +++ /var/tmp/diff_new_pack.d7S9J2/_new 2014-04-05 14:43:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.806 +Version: 0.810 Release: 0 Requires: coreutils Requires: e2fsprogs ++++++ perl-Bootloader-0.806.tar.xz -> perl-Bootloader-0.810.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.806/perl-Bootloader.changes new/perl-Bootloader-0.810/perl-Bootloader.changes --- old/perl-Bootloader-0.806/perl-Bootloader.changes 2014-03-04 17:48:42.000000000 +0100 +++ new/perl-Bootloader-0.810/perl-Bootloader.changes 2014-04-03 14:16:53.000000000 +0200 @@ -1,4 +1,29 @@ ------------------------------------------------------------------- +Thu Apr 3 14:16:07 CEST 2014 - [email protected] + +- fix ppc install (bnc #871691) +- 0.810 + +------------------------------------------------------------------- +Thu Apr 3 09:09:37 CEST 2014 - [email protected] + +- don't forget to update device.map (bnc #869083) +- 0.809 + +------------------------------------------------------------------- +Tue Apr 1 09:43:57 UTC 2014 - [email protected] + +- enable SUSE_BTRFS_SNAPSHOT_BOOTING on x86 as other architectures + are working in progress. +- 0.808 + +------------------------------------------------------------------- +Mon Mar 31 12:18:44 UTC 2014 - [email protected] + +- support snapper rollback (fate##317062) +- 0.807 + +------------------------------------------------------------------- Tue Mar 4 17:48:03 CET 2014 - [email protected] - support grub2 on s390x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.806/src/Core/GRUB2.pm new/perl-Bootloader-0.810/src/Core/GRUB2.pm --- old/perl-Bootloader-0.806/src/Core/GRUB2.pm 2014-03-04 17:48:42.000000000 +0100 +++ new/perl-Bootloader-0.810/src/Core/GRUB2.pm 2014-04-03 14:16:53.000000000 +0200 @@ -390,22 +390,17 @@ my $self = shift; 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()); + for my $i ( + Bootloader::Path::Grub2_installdevice(), + Bootloader::Path::Grub2_defaultconf(), + Bootloader::Path::Grub2_conf(), + Bootloader::Path::Grub2_devicemap(), + ) { + if (-e $i) { + push @ret, $i; + } else { + $self->warning ("$i: config file does not exist"); + } } return \@ret; @@ -816,6 +811,8 @@ $ret{"xen_append"} = $val; } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT$/) { $ret{"xen_kernel_append"} = $val; + } elsif ($key =~ m/@?SUSE_BTRFS_SNAPSHOT_BOOTING$/) { + $ret{"suse_btrfs"} = $val; } } @@ -979,6 +976,12 @@ my $distributor = delete $globinfo{"distributor"} || ""; my $append_failsafe = delete $globinfo{"append_failsafe"} || ""; my $os_prober = delete $globinfo{"os_prober"} || ""; + my $suse_btrfs = delete $globinfo{"suse_btrfs"} || ""; + # per default enable btrfs snapshot boot configs only on i386-pc + # other architectures (s390, ppc) are planned but not ready + if ($suse_btrfs eq "" and $self->{'target'} eq "i386-pc") { + $suse_btrfs = "true"; + } # $root = " root=$root" if $root ne ""; $vga = " vga=$vga" if $vga ne ""; $append = " $append" if $append ne ""; @@ -1085,6 +1088,9 @@ } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT$/) { $line_ref->{"value"} = $xen_kernel_append if $xen_kernel_append ne ""; $xen_kernel_append = ""; + } elsif ($key =~ m/@?SUSE_BTRFS_SNAPSHOT_BOOTING$/) { + $line_ref->{"value"} = $suse_btrfs if $suse_btrfs ne ""; + $suse_btrfs = ""; } defined $line_ref ? $line_ref : (); } @lines; @@ -1179,6 +1185,13 @@ "value" => $xen_kernel_append, } } + + if ($suse_btrfs ne "") { + push @lines, { + "key" => "SUSE_BTRFS_SNAPSHOT_BOOTING", + "value" => $suse_btrfs, + } + } return \@lines; } @@ -1321,21 +1334,31 @@ $self->milestone("devices =", \@devices); - # Hmm .. grub2-install must has been run before - # any grub2-mkconfig ... - # TODO: foreach .. looks awkward .. need clearify foreach my $dev (@devices) { + my $cmd = "/usr/sbin/grub2-install"; + my $opt = "--target=$self->{'target'} $install_opts \"$dev\""; + if ($dev eq "activate" or $dev eq "generic_mbr") { next; } + if ($glob{suse_btrfs} eq "true" and -e "/usr/sbin/suse_btrfs_grub2_install.sh") { + # enable btrfs snapshot boot configs only on i386-pc + # other architectures (s390, ppc) are planned but not ready + if ($self->{'target'} eq "i386-pc") { + my $rootfs = qx(/usr/sbin/grub2-probe -t fs /); + my $bootfs = qx(/usr/sbin/grub2-probe -t fs /boot); + chomp $rootfs; + chomp $bootfs; + if ($rootfs eq "btrfs" and $bootfs eq "btrfs") { + $cmd = "/usr/sbin/suse_btrfs_grub2_install.sh"; + } + } + } + my $ret = $self->RunCommand ( - # TODO: Use --force is for installing on BS - # the tradeoff is we can't capture errors - # only patch grub2 package is possible way - # to get around this problem - "/usr/sbin/grub2-install --target=$self->{'target'} $install_opts \"$dev\"", + "$cmd $opt", Bootloader::Path::BootCommandLogname() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.806/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.810/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.806/src/Core/GRUB2EFI.pm 2014-03-04 17:48:42.000000000 +0100 +++ new/perl-Bootloader-0.810/src/Core/GRUB2EFI.pm 2014-04-03 14:16:53.000000000 +0200 @@ -394,6 +394,8 @@ $ret{"xen_append"} = $val; } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT$/) { $ret{"xen_kernel_append"} = $val; + } elsif ($key =~ m/@?SUSE_BTRFS_SNAPSHOT_BOOTING$/) { + $ret{"suse_btrfs"} = $val; } } @@ -534,6 +536,10 @@ '# WARNING foregin OS menu entries will be lost if set true here' ], }, + { + 'key' => 'SUSE_BTRFS_SNAPSHOT_BOOTING', + 'value' => 'true', + }, ); } @@ -556,6 +562,7 @@ my $distributor = delete $globinfo{"distributor"} || ""; my $append_failsafe = delete $globinfo{"append_failsafe"} || ""; my $os_prober = delete $globinfo{"os_prober"} || ""; + my $suse_btrfs = delete $globinfo{"suse_btrfs"} || "true"; # $root = " root=$root" if $root ne ""; $vga = " vga=$vga" if $vga ne ""; $append = " $append" if $append ne ""; @@ -671,6 +678,9 @@ } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT$/) { $line_ref->{"value"} = $xen_kernel_append if $xen_kernel_append ne ""; $xen_kernel_append = ""; + } elsif ($key =~ m/@?SUSE_BTRFS_SNAPSHOT_BOOTING$/) { + $line_ref->{"value"} = $suse_btrfs if $suse_btrfs ne ""; + $suse_btrfs = ""; } defined $line_ref ? $line_ref : (); @@ -773,6 +783,13 @@ "value" => $xen_kernel_append, } } + + if ($suse_btrfs ne "") { + push @lines, { + "key" => "SUSE_BTRFS_SNAPSHOT_BOOTING", + "value" => $suse_btrfs, + } + } return \@lines; } @@ -861,26 +878,6 @@ return $self->InitializeBootloader (); } - if (defined $self->{secure_boot}) - { - my $opt = $self->{secure_boot} ? "--config-file=/boot/grub2/grub.cfg" : "--clean"; - my $cmd = "/usr/sbin/shim-install"; - - if ($self->{secure_boot}) { - $ret = $self->RunCommand ( - "$cmd $opt", - Bootloader::Path::BootCommandLogname() - ); - } else { - $ret = $self->RunCommand ( - "test -x $cmd && $cmd $opt || true", - Bootloader::Path::BootCommandLogname() - ); - } - - return 0 if (0 != $ret); - } - my $default = delete $glob{"default"}; if (defined $default and $default ne "") { @@ -909,34 +906,30 @@ sub InitializeBootloader { my $self = shift; my %glob = %{$self->{"global"}}; + my $ret = 1; + my $opt = "--target=$self->{'target'}"; + my $cmd = "/usr/sbin/grub2-install"; + + if ($self->{secure_boot}) { + $opt = "--config-file=/boot/grub2/grub.cfg"; + $cmd = "/usr/sbin/shim-install"; + } elsif ($glob{suse_btrfs} eq "true" and -e "/usr/sbin/suse_btrfs_grub2_install.sh") { + my $rootfs = qx(/usr/sbin/grub2-probe -t fs /); + my $bootfs = qx(/usr/sbin/grub2-probe -t fs /boot); + chomp $rootfs; + chomp $bootfs; + if ($rootfs eq "btrfs" and $bootfs eq "btrfs") { + $cmd = "/usr/sbin/suse_btrfs_grub2_install.sh"; + } + } - my $ret = $self->RunCommand ( - "/usr/sbin/grub2-install --target=$self->{'target'}", + $ret = $self->RunCommand ( + "$cmd $opt", Bootloader::Path::BootCommandLogname() ); return 0 if (0 != $ret); - if (defined $self->{secure_boot}) - { - my $opt = $self->{secure_boot} ? "--config-file=/boot/grub2/grub.cfg" : "--clean"; - my $cmd = "/usr/sbin/shim-install"; - - if ($self->{secure_boot}) { - $ret = $self->RunCommand ( - "$cmd $opt", - Bootloader::Path::BootCommandLogname() - ); - } else { - $ret = $self->RunCommand ( - "test -x $cmd && $cmd $opt || true", - Bootloader::Path::BootCommandLogname() - ); - } - - return 0 if (0 != $ret); - } - my $default = delete $glob{"default"}; if (defined $default and $default ne "") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.806/src/Core.pm new/perl-Bootloader-0.810/src/Core.pm --- old/perl-Bootloader-0.806/src/Core.pm 2014-03-04 17:48:42.000000000 +0100 +++ new/perl-Bootloader-0.810/src/Core.pm 2014-04-03 14:16:53.000000000 +0200 @@ -1582,6 +1582,8 @@ my @files = @{$files_ref}; my $ok = 1; + $self->milestone("Files to update:", $files_ref); + foreach my $file (@files) { next unless -f "$file.new"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.806/version new/perl-Bootloader-0.810/version --- old/perl-Bootloader-0.806/version 2014-03-04 17:48:42.000000000 +0100 +++ new/perl-Bootloader-0.810/version 2014-04-03 14:16:53.000000000 +0200 @@ -1 +1 @@ -0.806 +0.810 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
