Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2017-03-05 17:57:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Sun Mar 5 17:57:52 2017 rev:41 rq:461777 version:1.74 Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2017-02-22 13:51:03.669436948 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2017-03-05 17:58:21.911703907 +0100 @@ -1,0 +2,9 @@ +Wed Mar 1 04:58:40 UTC 2017 - [email protected] + +- 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 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober-btrfs-absolute-subvol.patch ++++++ --- /var/tmp/diff_new_pack.E8XIsj/_old 2017-03-05 17:58:22.783580500 +0100 +++ /var/tmp/diff_new_pack.E8XIsj/_new 2017-03-05 17:58:22.787579934 +0100 @@ -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-1.61/os-probes/common/50mounted-tests -@@ -58,9 +58,7 @@ mounted= +--- os-prober.orig/os-probes/common/50mounted-tests ++++ os-prober/os-probes/common/50mounted-tests +@@ -72,9 +72,7 @@ mounted= if [ "$types" = btrfs ]; then partition="$BTRFSDEV" @@ -13,7 +13,20 @@ 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 +@@ -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 fi # besides regular subvols, get ro and snapshot so thet can be excluded ++++++ os-prober-btrfs-always-detect-default.patch ++++++ --- /var/tmp/diff_new_pack.E8XIsj/_old 2017-03-05 17:58:22.799578236 +0100 +++ /var/tmp/diff_new_pack.E8XIsj/_new 2017-03-05 17:58:22.799578236 +0100 @@ -20,9 +20,9 @@ =================================================================== --- os-prober.orig/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 - do_unmount +probe_subvol () +{ @@ -68,7 +68,7 @@ # all btrfs processing here. Handle both unmounted and # mounted subvolumes. if [ "$types" = btrfs ]; then -@@ -135,45 +176,23 @@ if [ "$types" = btrfs ]; then +@@ -136,45 +177,23 @@ if [ "$types" = btrfs ]; then rmdir "$tmpmnt" || true exit 1 fi
