Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2015-07-05 17:51:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober"
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2015-06-03
08:20:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-07-05
17:51:11.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 18 10:24:05 UTC 2015 - mch...@suse.com
+
+- add os-prober-btrfs-absolute-subvol.patch
+ * fix os-prober mount error, no such file or directory (bsc#931955)
+
+-------------------------------------------------------------------
New:
----
os-prober-btrfs-absolute-subvol.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.pqQz5h/_old 2015-07-05 17:51:12.000000000 +0200
+++ /var/tmp/diff_new_pack.pqQz5h/_new 2015-07-05 17:51:12.000000000 +0200
@@ -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 @@
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 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
find . -name \*.orig -delete
%build
++++++ os-prober-btrfs-absolute-subvol.patch ++++++
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
