rpm/os-prober
SHA256
1
0
Fork 0
forked from pool/os-prober
Code Pull Requests Activity

Accepting request 312489 from home:michael-chang:branches:Base:System

Browse Source 
- add os-prober-btrfs-absolute-subvol.patch
  * fix os-prober mount error, no such file or directory (bsc#931955)

OBS-URL: https://build.opensuse.org/request/show/312489
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=56
This commit is contained in:
Andrei Borzenkov 2015-06-18 18:55:24 +00:00 committed by Git OBS Bridge
parent bb58685f87
commit d61f5aac8f
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
os-prober-btrfs-absolute-subvol.patch Normal file
View File

@ -0,0 +1,28 @@
Index: os-prober-1.61/os-probes/common/50mounted-tests
===================================================================
--- os-prober-1.61.orig/os-probes/common/50mounted-tests
+++ os-prober-1.61/os-probes/common/50mounted-tests
@@ -58,9 +58,7 @@ mounted=
if [ "$types" = btrfs ]; then
partition="$BTRFSDEV"
-fi
-
-if type grub2-mount >/dev/null 2>&1 && \
+elif type grub2-mount >/dev/null 2>&1 && \
type grub2-probe >/dev/null 2>&1 && \
grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
mounted=1
@@ -114,9 +112,9 @@ if [ "$types" = btrfs ]; then
exit 1
fi
# besides regular subvols, get ro and snapshot so thet can be excluded
- subvols=$(btrfs subvolume list "$tmpmnt" | cut -d ' ' -f 9)
- rosubvols=$(btrfs subvolume list -r "$tmpmnt" | cut -d ' ' -f 9)
- sssubvols=$(btrfs subvolume list -s "$tmpmnt" | cut -d ' ' -f 14)
+ subvols=$(btrfs subvolume list -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!)
+ rosubvols=$(btrfs subvolume list -r -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!)
+ sssubvols=$(btrfs subvolume list -s -a "$tmpmnt" | cut -d ' ' -f 14 | sed -e s!^\<FS_TREE\>/!!)
if ! umount "$tmpmnt"; then
warn "failed to umount btrfs volume on $tmpmnt"
rmdir "$tmpmnt" || true

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 18 10:24:05 UTC 2015 - mchang@suse.com
- add os-prober-btrfs-absolute-subvol.patch
* fix os-prober mount error, no such file or directory (bsc#931955)
-------------------------------------------------------------------
Mon Jun 1 07:16:32 UTC 2015 - mchang@suse.com

5
os-prober.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package os-prober
#
# Copyright (c) 2015 SUSE LINUX 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
@ -58,6 +58,8 @@ Patch15: os-prober-call-dmraid-once.patch
Patch16: os-prober-grep-for-windows-bcd-file.patch
# PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation (bsc#892364)
Patch17: Improve-btrfs-handling-on-os-probing-for-grub2.patch
# PATCH-FIX-SLE: fix os-prober mount error, no such file or directory (bsc#931955)
Patch18: os-prober-btrfs-absolute-subvol.patch
Requires: /bin/grep
Requires: /bin/sed
Requires: /sbin/modprobe
@ -96,6 +98,7 @@ cp %{SOURCE1} .
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
find . -name \*.orig -delete
%build