Accepting request 108604 from home:michael-chang:branches:Base:System
Please help to review the patch, thanks. Fix error in installation to extended partition (bnc#750897) - add grub2-skip-fs-probe-for-extended-partition.patch OBS-URL: https://build.opensuse.org/request/show/108604 OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=51
This commit is contained in:
parent
609d8bc1e0
commit
d734d0c0fa
35
grub2-skip-fs-probe-for-extended-partition.patch
Normal file
35
grub2-skip-fs-probe-for-extended-partition.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
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"
|
||||||
|
);
|
||||||
|
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 9 08:40:15 UTC 2012 - mchang@suse.com
|
||||||
|
|
||||||
|
- grub2-skip-fs-probe-for-extended-partition.patch (bnc#750897)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 5 15:38:44 CET 2012 - snwint@suse.de
|
Mon Mar 5 15:38:44 CET 2012 - snwint@suse.de
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@ Source: perl-Bootloader-%{version}.tar.bz2
|
|||||||
Source1: update-bootloader
|
Source1: update-bootloader
|
||||||
Source2: bootloader_entry
|
Source2: bootloader_entry
|
||||||
Source3: boot.readme
|
Source3: boot.readme
|
||||||
|
Patch: grub2-skip-fs-probe-for-extended-partition.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: perl
|
BuildRequires: perl
|
||||||
Conflicts: multipath-tools < 0.4.8-40.25.1
|
Conflicts: multipath-tools < 0.4.8-40.25.1
|
||||||
@ -48,6 +49,7 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch -p1
|
||||||
rm -rf perl-Bootloader-testsuite
|
rm -rf perl-Bootloader-testsuite
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
mv src lib/Bootloader
|
mv src lib/Bootloader
|
||||||
|
Loading…
x
Reference in New Issue
Block a user