pool/os-prober
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 307028 from home:michael-chang:bsc892364

Browse Source 
- os-prober-btrfsfix-trim-leading-subvol.patch
  * fix os-prober fails to detect other SLES12 installation (bsc#892364)

OBS-URL: https://build.opensuse.org/request/show/307028
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=51
This commit is contained in:
Andrei Borzenkov 2015-05-14 17:32:30 +00:00 committed by Git OBS Bridge
parent 06d68ed81f
commit 9f81a3dcf6
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os-prober-btrfsfix-trim-leading-subvol.patch Normal file
View File

@ -0,0 +1,13 @@
Index: os-prober/linux-boot-probes/mounted/common/40grub2
===================================================================
--- os-prober.orig/linux-boot-probes/mounted/common/40grub2
+++ os-prober/linux-boot-probes/mounted/common/40grub2
@@ -16,7 +16,7 @@ found_item=0
entry_result () {
if [ "x$type" = "xbtrfs" -a "$rootsv" = "$bootsv" ]; then
# trim off the leading subvol
- kernelfile=$(echo "$kernel" | cut -d '/' -f 2- | cut -d '/' -f 2-)
+ kernelfile=$(echo "$kernel" | sed -e "s!^/${rootsv}/!!")
else
kernelfile=$kernel
fi

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 13 15:45:30 UTC 2015 - mchang@suse.com
- os-prober-btrfsfix-trim-leading-subvol.patch
* fix os-prober fails to detect other SLES12 installation (bsc#892364)
-------------------------------------------------------------------
Mon Jan 26 09:35:55 UTC 2015 - mchang@suse.com

5
os-prober.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package os-prober
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -56,6 +56,8 @@ Patch14: os-prober-skip-part-on-multipath.patch
Patch15: os-prober-call-dmraid-once.patch
# PATCH-FIX-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista (bsc#910654)
Patch16: os-prober-grep-for-windows-bcd-file.patch
# PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation (bsc#892364)
Patch17: os-prober-btrfsfix-trim-leading-subvol.patch
Requires: /bin/grep
Requires: /bin/sed
Requires: /sbin/modprobe
@ -93,6 +95,7 @@ cp %{SOURCE1} .
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
find . -name \*.orig -delete
%build