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

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

Browse Source 
- Fix btrfs 1.74 regression in detection btrfs, the do_unmount has to be
  skipped for btrfs as it removes tmp mount point of which btrfs is making
  use (bsc#1024196)
  * modify os-prober-btrfs-absolute-subvol.patch
  * rediff os-prober-btrfs-always-detect-default.patch

OBS-URL: https://build.opensuse.org/request/show/461360
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=75
This commit is contained in:
Andrei Borzenkov 2017-03-02 08:02:03 +00:00 committed by Git OBS Bridge
parent 8f472cc59a
commit f8e000ca22
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
os-prober-btrfs-absolute-subvol.patch
View File

@ -1,8 +1,8 @@
Index: os-prober-1.61/os-probes/common/50mounted-tests Index: os-prober/os-probes/common/50mounted-tests
=================================================================== ===================================================================
--- os-prober-1.61.orig/os-probes/common/50mounted-tests --- os-prober.orig/os-probes/common/50mounted-tests
+++ os-prober-1.61/os-probes/common/50mounted-tests +++ os-prober/os-probes/common/50mounted-tests
@@ -58,9 +58,7 @@ mounted= @@ -72,9 +72,7 @@ mounted=
if [ "$types" = btrfs ]; then if [ "$types" = btrfs ]; then
partition="$BTRFSDEV" partition="$BTRFSDEV"
@ -13,7 +13,20 @@ Index: os-prober-1.61/os-probes/common/50mounted-tests
type grub2-probe >/dev/null 2>&1 && \ type grub2-probe >/dev/null 2>&1 && \
grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
mounted=1 mounted=1
@@ -114,9 +112,9 @@ if [ "$types" = btrfs ]; then @@ -110,7 +108,11 @@ if [ "$mounted" ]; then
fi
done
fi
-do_unmount
+
+if [ "$types" != "btrfs" ]; then
+ do_unmount
+ exit 1
+fi
# all btrfs processing here. Handle both unmounted and
# mounted subvolumes.
@@ -125,9 +127,9 @@ if [ "$types" = btrfs ]; then
exit 1 exit 1
fi fi
# besides regular subvols, get ro and snapshot so thet can be excluded # besides regular subvols, get ro and snapshot so thet can be excluded

6
os-prober-btrfs-always-detect-default.patch
View File

@ -20,9 +20,9 @@ Index: os-prober/os-probes/common/50mounted-tests
=================================================================== ===================================================================
--- os-prober.orig/os-probes/common/50mounted-tests --- os-prober.orig/os-probes/common/50mounted-tests
+++ os-prober/os-probes/common/50mounted-tests +++ os-prober/os-probes/common/50mounted-tests
@@ -113,6 +113,47 @@ if [ "$mounted" ]; then @@ -114,6 +114,47 @@ if [ "$types" != "btrfs" ]; then
exit 1
fi fi
do_unmount
+probe_subvol () +probe_subvol ()
+{ +{
@ -68,7 +68,7 @@ Index: os-prober/os-probes/common/50mounted-tests
# all btrfs processing here. Handle both unmounted and # all btrfs processing here. Handle both unmounted and
# mounted subvolumes. # mounted subvolumes.
if [ "$types" = btrfs ]; then if [ "$types" = btrfs ]; then
@@ -135,45 +176,23 @@ if [ "$types" = btrfs ]; then @@ -136,45 +177,23 @@ if [ "$types" = btrfs ]; then
rmdir "$tmpmnt" || true rmdir "$tmpmnt" || true
exit 1 exit 1
fi fi

9
os-prober.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Mar 1 04:58:40 UTC 2017 - mchang@suse.com
- Fix btrfs 1.74 regression in detection btrfs, the do_unmount has to be
skipped for btrfs as it removes tmp mount point of which btrfs is making
use (bsc#1024196)
* modify os-prober-btrfs-absolute-subvol.patch
* rediff os-prober-btrfs-always-detect-default.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 10 08:45:28 UTC 2017 - mchang@suse.com Fri Feb 10 08:45:28 UTC 2017 - mchang@suse.com