Hello community,

here is the log from the commit of package perl-Bootloader for openSUSE:Factory 
checked in at 2012-03-20 11:31:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
 and      /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "perl-Bootloader", Maintainer is "snw...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes  
2012-03-06 13:40:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes     
2012-03-20 11:31:29.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar  9 08:40:15 UTC 2012 - mch...@suse.com
+
+- grub2-skip-fs-probe-for-extended-partition.patch (bnc#750897) 
+
+-------------------------------------------------------------------

New:
----
  grub2-skip-fs-probe-for-extended-partition.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.RCtyEc/_old  2012-03-20 11:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.RCtyEc/_new  2012-03-20 11:31:31.000000000 +0100
@@ -29,6 +29,7 @@
 Source1:        update-bootloader
 Source2:        bootloader_entry
 Source3:        boot.readme
+Patch:          grub2-skip-fs-probe-for-extended-partition.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
 Conflicts:      multipath-tools < 0.4.8-40.25.1
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch -p1
 rm -rf perl-Bootloader-testsuite
 mkdir -p lib
 mv src lib/Bootloader

++++++ grub2-skip-fs-probe-for-extended-partition.patch ++++++
Index: perl-Bootloader-0.6.0/src/Core/GRUB2.pm
===================================================================
--- perl-Bootloader-0.6.0.orig/src/Core/GRUB2.pm
+++ perl-Bootloader-0.6.0/src/Core/GRUB2.pm
@@ -655,6 +655,7 @@ Returns undef on fail, defined nonzero v
 # boolean InitializeBootloader ()
 sub InitializeBootloader {
     my $self = shift;
+    my %glob = %{$self->{"global"}};
     my $file = Bootloader::Path::Grub2_installdevice();
     my $files_ref = $self->ReadFiles ([$file,]);
 
@@ -663,6 +664,13 @@ sub InitializeBootloader {
         return undef;
     }
 
+    my $install_opts = "--force";
+    my $skip_fs_probe = delete $glob{"boot_extended"};
+
+    if (defined $skip_fs_probe and $skip_fs_probe eq "true") {
+        $install_opts .= " --skip-fs-probe ";
+    }
+
     my @devices = @{$files_ref->{$file} || []};
 
     # Hmm .. grub2-install must has been run before
@@ -679,7 +687,7 @@ sub InitializeBootloader {
             # the tradeoff is we can't capture errors
             # only patch grub2 package is possible way
             # to get around this problem
-            "/usr/sbin/grub2-install --force $dev",
+            "/usr/sbin/grub2-install $install_opts $dev",
             "/var/log/YaST2/y2log_bootloader"
         );
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to